You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/08/03 15:06:51 UTC
[1/6] allura git commit: Added confirmation before accepting or
rejecting merge request
Repository: allura
Updated Branches:
refs/heads/master 6b84190be -> 4a9ab0bf4
Added confirmation before accepting or rejecting merge request
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/1a3e2c6c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/1a3e2c6c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/1a3e2c6c
Branch: refs/heads/master
Commit: 1a3e2c6ce8e7abca72b501910ccac637785b95d6
Parents: a494e76
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jul 19 01:49:26 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:17 2016 -0400
----------------------------------------------------------------------
Allura/allura/lib/widgets/repo.py | 2 +-
Allura/allura/templates/repo/merge_request.html | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/1a3e2c6c/Allura/allura/lib/widgets/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index 767094e..4fa563d 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -80,7 +80,7 @@ class SCMMergeRequestWidget(ff.ForgeForm):
options=self.target_branches),
ffw.MarkdownEdit(name='description')]
return result
-
+
class SCMMergeRequestDisposeWidget(ff.ForgeForm):
http://git-wip-us.apache.org/repos/asf/allura/blob/1a3e2c6c/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index 543eaf8..a80d3cf 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -88,7 +88,7 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
<div class="grid-19 merge-toolbar">
{% if req.merge_allowed(c.user) %}
- <form action="merge" method="POST">
+ <form action="merge" method="POST" onsubmit="return confirm('Do you really want to Accept this Merge Request?');">
{{ lib.csrf_token() }}
<button type="submit" id="merge-btn">
<i class="fa fa-code-fork fa-flip-vertical" aria-hidden="true" {% if not can_merge or merge_status in ('ready', 'busy') %}disabled="disabled"{% endif %}></i> Merge
@@ -97,7 +97,7 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
{% endif %}
{% if req.creator == c.user and req.status == "open" %}
- <form action="save" method="POST">
+ <form action="save" method="POST" onsubmit="return confirm('Do you really want to Reject this Merge Request?');">
{{ lib.csrf_token() }}
<input type="hidden" value="rejected" name="status">
<button type="submit" id="reject-btn" type="submit" >
[3/6] allura git commit: undo removing nested-grid-container
Posted by br...@apache.org.
undo removing nested-grid-container
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a494e760
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a494e760
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a494e760
Branch: refs/heads/master
Commit: a494e760b09a3c08c7bea80cb111ca5b2eb60838
Parents: 6a96002
Author: Rohan Verma <ro...@gmail.com>
Authored: Tue Jul 26 14:50:28 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:17 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 9 +++++++++
1 file changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a494e760/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index f362abe..ebd5e29 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1216,6 +1216,15 @@ a.active {
width: 960px;
}
+.nested-grid-container {
+ display: inline-block;
+ margin-left: -10px;
+ margin-right: -10px;
+ overflow: hidden;
+ *zoom: 1;
+ width: auto;
+}
+
.filter-container {
display: inline-block;
overflow: hidden;
[6/6] allura git commit: Remove unnecessary status param from
all_merge_requests
Posted by br...@apache.org.
Remove unnecessary status param from all_merge_requests
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4a9ab0bf
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4a9ab0bf
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4a9ab0bf
Branch: refs/heads/master
Commit: 4a9ab0bf45e7ed934a654273a474cfa8349267b2
Parents: c7c520e
Author: Dave Brondsema <da...@brondsema.net>
Authored: Wed Aug 3 11:05:09 2016 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:18 2016 -0400
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 2 +-
Allura/allura/model/repository.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4a9ab0bf/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index 82a2d7b..09743f8 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -342,7 +342,7 @@ class MergeRequestsController(object):
status = status or 'open'
status = [status]
if status == ['all']:
- requests = c.app.repo.all_merge_requests(*status)
+ requests = c.app.repo.all_merge_requests()
else:
requests = c.app.repo.merge_requests_by_statuses(*status)
http://git-wip-us.apache.org/repos/asf/allura/blob/4a9ab0bf/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 5994642..8ee52b5 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -633,7 +633,7 @@ class Repository(Artifact, ActivityObject):
status={'$in': statuses})).sort(
'request_number')
- def all_merge_requests(self, *statuses):
+ def all_merge_requests(self):
return MergeRequest.query.find(dict(
app_config_id=self.app.config._id)).sort(
'request_number')
[2/6] allura git commit: Improve design of merge requests listing
filter
Posted by br...@apache.org.
Improve design of merge requests listing filter
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/d7d8b6f0
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/d7d8b6f0
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/d7d8b6f0
Branch: refs/heads/master
Commit: d7d8b6f0ff20d5eaa082f56fd12aa253c4f24bb8
Parents: 6b84190
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri Jul 8 13:32:11 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:17 2016 -0400
----------------------------------------------------------------------
Allura/allura/nf/allura/css/site_style.css | 26 ++++++++++++++++++--
.../allura/templates/repo/merge_requests.html | 7 +++++-
2 files changed, 30 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/d7d8b6f0/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 51c2102..289d4f6 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -1213,13 +1213,35 @@ a.active {
.nested-grid-container {
display: inline-block;
- margin-left: -10px;
- margin-right: -10px;
overflow: hidden;
+ padding-left: 10px;
*zoom: 1;
width: auto;
}
+label.btn-set{
+ float:left;
+ position:relative;
+ top: 5px;
+ padding-right: 5px;
+}
+
+button.btn-set{
+ margin: 0px;
+ border-radius: 0px;
+ font-weight: bold;
+}
+
+button.btn-set.left{
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+}
+
+button.btn-set.right{
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+}
+
.grid-block {
display: inline;
float: left;
http://git-wip-us.apache.org/repos/asf/allura/blob/d7d8b6f0/Allura/allura/templates/repo/merge_requests.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html
index 2c37a45..4100daf 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -25,7 +25,12 @@
{% block header %}{{c.app.config.options.mount_label}} Merge Requests{% endblock %}
{% block content %}
<div class="nested-grid-container">
- {{ c.mr_filter.display(action='.', value=dict(status=status)) }}
+ <form method="GET" action=".">
+ <label class="btn-set">Filter </label>
+ <button type="submit" class="submit btn-set left" style="color:green" name="status" value="open">Open</button>
+ <button type="submit" class="submit btn-set" style="color:red" name="status" value="closed">Closed</button>
+ <button type="submit" class="submit btn-set right" style="color:DeepSkyBlue" name="status" value="merged">Merged</button>
+ </form>
</div>
<table>
[4/6] allura git commit: Updated design inline with suggestions and
removed widget from codebase
Posted by br...@apache.org.
Updated design inline with suggestions and removed widget from codebase
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/6a960028
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/6a960028
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/6a960028
Branch: refs/heads/master
Commit: 6a9600282da7cbf0f766aeda155d68f9f24d3982
Parents: d7d8b6f
Author: Rohan Verma <ro...@gmail.com>
Authored: Mon Jul 18 21:33:32 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:17 2016 -0400
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 5 +---
Allura/allura/lib/widgets/repo.py | 12 +-------
Allura/allura/nf/allura/css/site_style.css | 30 ++++----------------
.../allura/templates/repo/merge_requests.html | 15 ++++++----
4 files changed, 18 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/6a960028/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index 14745bf..fe2c9c9 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -45,7 +45,7 @@ from allura.lib.diff import HtmlSideBySideDiff
from allura.lib.security import require_access, require_authenticated, has_access
from allura.lib.widgets import form_fields as ffw
from allura.lib.widgets.repo import SCMLogWidget, SCMRevisionWidget, SCMTreeWidget
-from allura.lib.widgets.repo import SCMMergeRequestWidget, SCMMergeRequestFilterWidget
+from allura.lib.widgets.repo import SCMMergeRequestWidget
from allura.lib.widgets.repo import SCMMergeRequestDisposeWidget, SCMCommitBrowserWidget
from allura.lib.widgets.subscriptions import SubscribeForm
from allura.controllers import AppDiscussionController
@@ -335,15 +335,12 @@ class RepoRestController(RepoRootController, AppRestControllerMixin):
class MergeRequestsController(object):
- mr_filter = SCMMergeRequestFilterWidget()
@with_trailing_slash
@expose('jinja:allura:templates/repo/merge_requests.html')
- @validate(mr_filter)
def index(self, status=None, **kw):
status = status or ['open']
requests = c.app.repo.merge_requests_by_statuses(*status)
- c.mr_filter = self.mr_filter
return dict(
status=status,
requests=requests)
http://git-wip-us.apache.org/repos/asf/allura/blob/6a960028/Allura/allura/lib/widgets/repo.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/repo.py b/Allura/allura/lib/widgets/repo.py
index a43aa60..767094e 100644
--- a/Allura/allura/lib/widgets/repo.py
+++ b/Allura/allura/lib/widgets/repo.py
@@ -80,17 +80,7 @@ class SCMMergeRequestWidget(ff.ForgeForm):
options=self.target_branches),
ffw.MarkdownEdit(name='description')]
return result
-
-
-class SCMMergeRequestFilterWidget(ff.ForgeForm):
- defaults = dict(
- ff.ForgeForm.defaults,
- submit_text='Filter',
- method='GET')
-
- class fields(ew_core.NameList):
- status = ew.MultiSelectField(options=M.MergeRequest.statuses)
-
+
class SCMMergeRequestDisposeWidget(ff.ForgeForm):
http://git-wip-us.apache.org/repos/asf/allura/blob/6a960028/Allura/allura/nf/allura/css/site_style.css
----------------------------------------------------------------------
diff --git a/Allura/allura/nf/allura/css/site_style.css b/Allura/allura/nf/allura/css/site_style.css
index 289d4f6..f362abe 100644
--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -954,6 +954,7 @@ a.btn:active {
border-radius: 0;
border: 1px solid #aaaaaa !important;
}
+
.btn-set .btn:first-child {
-moz-border-radius-topleft: 4px;
-webkit-border-top-left-radius: 4px;
@@ -991,6 +992,10 @@ a.btn:active {
margin: 0 0 0 0;
}
+.btn-set .joined{
+ margin: 0 0 10px 0 !important;
+}
+
.btn-bar, #top_nav {
display: block;
clear: both;
@@ -1211,7 +1216,7 @@ a.active {
width: 960px;
}
-.nested-grid-container {
+.filter-container {
display: inline-block;
overflow: hidden;
padding-left: 10px;
@@ -1219,29 +1224,6 @@ a.active {
width: auto;
}
-label.btn-set{
- float:left;
- position:relative;
- top: 5px;
- padding-right: 5px;
-}
-
-button.btn-set{
- margin: 0px;
- border-radius: 0px;
- font-weight: bold;
-}
-
-button.btn-set.left{
- border-top-left-radius: 4px;
- border-bottom-left-radius: 4px;
-}
-
-button.btn-set.right{
- border-top-right-radius: 4px;
- border-bottom-right-radius: 4px;
-}
-
.grid-block {
display: inline;
float: left;
http://git-wip-us.apache.org/repos/asf/allura/blob/6a960028/Allura/allura/templates/repo/merge_requests.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html
index 4100daf..61341c9 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -18,18 +18,23 @@
-#}
{% extends 'allura:templates/repo/repo_master.html' %}
+{% set status = request.params.get('status' , '') %}
+
{% block title %}
{{c.project.name}} / {{c.app.config.options.mount_label}} / Merge Requests
{% endblock %}
{% block header %}{{c.app.config.options.mount_label}} Merge Requests{% endblock %}
{% block content %}
- <div class="nested-grid-container">
+ <div class="filter-container">
<form method="GET" action=".">
- <label class="btn-set">Filter </label>
- <button type="submit" class="submit btn-set left" style="color:green" name="status" value="open">Open</button>
- <button type="submit" class="submit btn-set" style="color:red" name="status" value="closed">Closed</button>
- <button type="submit" class="submit btn-set right" style="color:DeepSkyBlue" name="status" value="merged">Merged</button>
+ <div class="btn-set">
+ <button type="button" class="btn duo joined"><i class="fa fa-filter" aria-hidden="true"></i></button>
+ <button type="submit" class="btn duo joined {% if status == '' %}active{% endif %}" name="status" value="">All</button>
+ <button type="submit" class="btn duo joined {% if status == 'open' %}active{% endif %}" style="color:green" name="status" value="open">Open</button>
+ <button type="submit" class="btn duo joined {% if status == 'closed' %}active{% endif %}" style="color:red" name="status" value="closed">Closed</button>
+ <button type="submit" class="btn duo joined {% if status == 'merged' %}active{% endif %}" style="color:DeepSkyBlue" name="status" value="merged">Merged</button>
+ </div>
</form>
</div>
[5/6] allura git commit: Added new method to list all MRs and fixed
the inconsistencies with the MR filtering UI
Posted by br...@apache.org.
Added new method to list all MRs and fixed the inconsistencies with the MR filtering UI
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/c7c520e2
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/c7c520e2
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/c7c520e2
Branch: refs/heads/master
Commit: c7c520e2a026ef7130d1c082b264ec0004d7b630
Parents: 1a3e2c6
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed Aug 3 16:47:21 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Aug 3 11:05:18 2016 -0400
----------------------------------------------------------------------
Allura/allura/controllers/repository.py | 9 +++++++--
Allura/allura/model/repository.py | 5 +++++
Allura/allura/templates/repo/merge_requests.html | 6 +++---
3 files changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/c7c520e2/Allura/allura/controllers/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/repository.py b/Allura/allura/controllers/repository.py
index fe2c9c9..82a2d7b 100644
--- a/Allura/allura/controllers/repository.py
+++ b/Allura/allura/controllers/repository.py
@@ -339,8 +339,13 @@ class MergeRequestsController(object):
@with_trailing_slash
@expose('jinja:allura:templates/repo/merge_requests.html')
def index(self, status=None, **kw):
- status = status or ['open']
- requests = c.app.repo.merge_requests_by_statuses(*status)
+ status = status or 'open'
+ status = [status]
+ if status == ['all']:
+ requests = c.app.repo.all_merge_requests(*status)
+ else:
+ requests = c.app.repo.merge_requests_by_statuses(*status)
+
return dict(
status=status,
requests=requests)
http://git-wip-us.apache.org/repos/asf/allura/blob/c7c520e2/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 1109216..5994642 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -633,6 +633,11 @@ class Repository(Artifact, ActivityObject):
status={'$in': statuses})).sort(
'request_number')
+ def all_merge_requests(self, *statuses):
+ return MergeRequest.query.find(dict(
+ app_config_id=self.app.config._id)).sort(
+ 'request_number')
+
@LazyProperty
def _additional_viewable_extensions(self):
ext_list = self.additional_viewable_extensions or ''
http://git-wip-us.apache.org/repos/asf/allura/blob/c7c520e2/Allura/allura/templates/repo/merge_requests.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html
index 61341c9..2d6b8ae 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -30,9 +30,9 @@
<form method="GET" action=".">
<div class="btn-set">
<button type="button" class="btn duo joined"><i class="fa fa-filter" aria-hidden="true"></i></button>
- <button type="submit" class="btn duo joined {% if status == '' %}active{% endif %}" name="status" value="">All</button>
- <button type="submit" class="btn duo joined {% if status == 'open' %}active{% endif %}" style="color:green" name="status" value="open">Open</button>
- <button type="submit" class="btn duo joined {% if status == 'closed' %}active{% endif %}" style="color:red" name="status" value="closed">Closed</button>
+ <button type="submit" class="btn duo joined {% if status == 'all' %}active{% endif %}" name="status" value="all">All</button>
+ <button type="submit" class="btn duo joined {% if status == 'open' or status == '' %}active{% endif %}" style="color:green" name="status" value="open">Open</button>
+ <button type="submit" class="btn duo joined {% if status == 'rejected' %}active{% endif %}" style="color:red" name="status" value="rejected">Rejected</button>
<button type="submit" class="btn duo joined {% if status == 'merged' %}active{% endif %}" style="color:DeepSkyBlue" name="status" value="merged">Merged</button>
</div>
</form>