Show More
@@ -97,7 +97,7 b' class PullrequestsController(BaseRepoCon' | |||||
97 | return repo.branches.keys()[0] |
|
97 | return repo.branches.keys()[0] | |
98 |
|
98 | |||
99 | def _get_is_allowed_change_status(self, pull_request): |
|
99 | def _get_is_allowed_change_status(self, pull_request): | |
100 |
owner = self.rhodecode_user.user_id == pull_request.user_id |
|
100 | owner = self.rhodecode_user.user_id == pull_request.user_id | |
101 | reviewer = self.rhodecode_user.user_id in [x.user_id for x in |
|
101 | reviewer = self.rhodecode_user.user_id in [x.user_id for x in | |
102 | pull_request.reviewers] |
|
102 | pull_request.reviewers] | |
103 | return (self.rhodecode_user.admin or owner or reviewer) |
|
103 | return (self.rhodecode_user.admin or owner or reviewer) |
@@ -1170,4 +1170,3 b' def ip_range(ip_addr):' | |||||
1170 | from rhodecode.model.db import UserIpMap |
|
1170 | from rhodecode.model.db import UserIpMap | |
1171 | s, e = UserIpMap._get_ip_range(ip_addr) |
|
1171 | s, e = UserIpMap._get_ip_range(ip_addr) | |
1172 | return '%s - %s' % (s, e) |
|
1172 | return '%s - %s' % (s, e) | |
1173 |
|
@@ -751,4 +751,4 b' def jsonify(func, *args, **kwargs):' | |||||
751 | warnings.warn(msg, Warning, 2) |
|
751 | warnings.warn(msg, Warning, 2) | |
752 | log.warning(msg) |
|
752 | log.warning(msg) | |
753 | log.debug("Returning JSON wrapped action output") |
|
753 | log.debug("Returning JSON wrapped action output") | |
754 | return json.dumps(data, encoding='utf-8') No newline at end of file |
|
754 | return json.dumps(data, encoding='utf-8') |
@@ -566,7 +566,7 b" def ValidPerms(type_='repo'):" | |||||
566 | def ValidSettings(): |
|
566 | def ValidSettings(): | |
567 | class _validator(formencode.validators.FancyValidator): |
|
567 | class _validator(formencode.validators.FancyValidator): | |
568 | def _to_python(self, value, state): |
|
568 | def _to_python(self, value, state): | |
569 |
# settings form for users that are not admin |
|
569 | # settings form for users that are not admin | |
570 | # can't edit certain parameters, it's extra backup if they mangle |
|
570 | # can't edit certain parameters, it's extra backup if they mangle | |
571 | # with forms |
|
571 | # with forms | |
572 |
|
572 |
@@ -53,4 +53,3 b" YUE.on('filter_form','submit',function(e" | |||||
53 | fix_j_filter_width(YUD.get('j_filter').value.length); |
|
53 | fix_j_filter_width(YUD.get('j_filter').value.length); | |
54 | </script> |
|
54 | </script> | |
55 | </%def> |
|
55 | </%def> | |
56 |
|
@@ -16,7 +16,7 b'' | |||||
16 | ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))} |
|
16 | ${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))} | |
17 | %else: |
|
17 | %else: | |
18 | ${l.username} |
|
18 | ${l.username} | |
19 |
%endif |
|
19 | %endif | |
20 | </td> |
|
20 | </td> | |
21 | <td>${h.action_parser(l)[0]()} |
|
21 | <td>${h.action_parser(l)[0]()} | |
22 | <div class="journal_action_params"> |
|
22 | <div class="journal_action_params"> |
@@ -74,7 +74,7 b'' | |||||
74 | return false; |
|
74 | return false; | |
75 | } |
|
75 | } | |
76 | })(window); |
|
76 | })(window); | |
77 |
|
77 | |||
78 | YUE.onDOMReady(function(){ |
|
78 | YUE.onDOMReady(function(){ | |
79 | tooltip_activate(); |
|
79 | tooltip_activate(); | |
80 | show_more_event(); |
|
80 | show_more_event(); | |
@@ -83,7 +83,7 b'' | |||||
83 | YUE.on('quick_login_link','click',function(e){ |
|
83 | YUE.on('quick_login_link','click',function(e){ | |
84 | // make sure we don't redirect |
|
84 | // make sure we don't redirect | |
85 | YUE.preventDefault(e); |
|
85 | YUE.preventDefault(e); | |
86 |
|
86 | |||
87 | if(YUD.hasClass('quick_login_link','enabled')){ |
|
87 | if(YUD.hasClass('quick_login_link','enabled')){ | |
88 | YUD.setStyle('quick_login','display','none'); |
|
88 | YUD.setStyle('quick_login','display','none'); | |
89 | YUD.removeClass('quick_login_link','enabled'); |
|
89 | YUD.removeClass('quick_login_link','enabled'); |
@@ -40,7 +40,7 b'' | |||||
40 | %endfor |
|
40 | %endfor | |
41 | %else: |
|
41 | %else: | |
42 | <span>${_('No parents')}</span> |
|
42 | <span>${_('No parents')}</span> | |
43 |
%endif |
|
43 | %endif | |
44 | </div> |
|
44 | </div> | |
45 | <div class="children"> |
|
45 | <div class="children"> | |
46 | %if c.changeset.children: |
|
46 | %if c.changeset.children: | |
@@ -50,10 +50,10 b'' | |||||
50 | %endfor |
|
50 | %endfor | |
51 | %else: |
|
51 | %else: | |
52 | <span>${_('No children')}</span> |
|
52 | <span>${_('No children')}</span> | |
53 |
%endif |
|
53 | %endif | |
54 |
</div> |
|
54 | </div> | |
55 | <div class="code-header banner"> |
|
55 | <div class="code-header banner"> | |
56 |
|
56 | |||
57 | <div class="hash"> |
|
57 | <div class="hash"> | |
58 | r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} |
|
58 | r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} | |
59 | </div> |
|
59 | </div> | |
@@ -74,7 +74,7 b'' | |||||
74 | ${c.context_url(request.GET)} |
|
74 | ${c.context_url(request.GET)} | |
75 | </div> |
|
75 | </div> | |
76 | <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div> |
|
76 | <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</div> | |
77 |
</div> |
|
77 | </div> | |
78 | </div> |
|
78 | </div> | |
79 | <div id="changeset_content"> |
|
79 | <div id="changeset_content"> | |
80 | <div class="container"> |
|
80 | <div class="container"> |
@@ -130,7 +130,7 b'' | |||||
130 | <div id="status_block_container" class="status-block" style="display:none"> |
|
130 | <div id="status_block_container" class="status-block" style="display:none"> | |
131 | %for status,lbl in c.changeset_statuses: |
|
131 | %for status,lbl in c.changeset_statuses: | |
132 | <div class=""> |
|
132 | <div class=""> | |
133 |
<img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}"> |
|
133 | <img src="${h.url('/images/icons/flag_status_%s.png' % status)}" /> <input ${'checked="checked"' if status == cur_status else ''}" type="radio" class="status_change_radio" name="changeset_status" id="${status}" value="${status}"> | |
134 | <label for="${status}">${lbl}</label> |
|
134 | <label for="${status}">${lbl}</label> | |
135 | </div> |
|
135 | </div> | |
136 | %endfor |
|
136 | %endfor |
@@ -268,7 +268,7 b'' | |||||
268 | {key:"last_change",label:"${_('Last Change')}",sortable:true, |
|
268 | {key:"last_change",label:"${_('Last Change')}",sortable:true, | |
269 | sortOptions: { sortFunction: ageSort }}, |
|
269 | sortOptions: { sortFunction: ageSort }}, | |
270 | {key:"tip",label:"${_('Tip')}",sortable:true, |
|
270 | {key:"tip",label:"${_('Tip')}",sortable:true, | |
271 |
sortOptions: { sortFunction: revisionSort }}, |
|
271 | sortOptions: { sortFunction: revisionSort }}, | |
272 | {key:"owner",label:"${_('Owner')}",sortable:true}, |
|
272 | {key:"owner",label:"${_('Owner')}",sortable:true}, | |
273 | {key:"rss",label:"",sortable:false}, |
|
273 | {key:"rss",label:"",sortable:false}, | |
274 | {key:"atom",label:"",sortable:false}, |
|
274 | {key:"atom",label:"",sortable:false}, |
@@ -114,7 +114,7 b'' | |||||
114 | </div> |
|
114 | </div> | |
115 |
|
115 | |||
116 | <script type="text/javascript"> |
|
116 | <script type="text/javascript"> | |
117 |
|
117 | |||
118 | YUE.on('j_filter','click',function(){ |
|
118 | YUE.on('j_filter','click',function(){ | |
119 | var jfilter = YUD.get('j_filter'); |
|
119 | var jfilter = YUD.get('j_filter'); | |
120 | if(YUD.hasClass(jfilter, 'initial')){ |
|
120 | if(YUD.hasClass(jfilter, 'initial')){ | |
@@ -132,8 +132,8 b'' | |||||
132 | var val = YUD.get('j_filter').value; |
|
132 | var val = YUD.get('j_filter').value; | |
133 | window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val); |
|
133 | window.location = "${url.current(filter='__FILTER__')}".replace('__FILTER__',val); | |
134 | }); |
|
134 | }); | |
135 |
fix_j_filter_width(YUD.get('j_filter').value.length); |
|
135 | fix_j_filter_width(YUD.get('j_filter').value.length); | |
136 |
|
136 | |||
137 | var show_my = function(e){ |
|
137 | var show_my = function(e){ | |
138 | YUD.setStyle('watched','display','none'); |
|
138 | YUD.setStyle('watched','display','none'); | |
139 | YUD.setStyle('my','display',''); |
|
139 | YUD.setStyle('my','display',''); |
@@ -198,7 +198,7 b'' | |||||
198 | // inject comments into they proper positions |
|
198 | // inject comments into they proper positions | |
199 | var file_comments = YUQ('.inline-comment-placeholder'); |
|
199 | var file_comments = YUQ('.inline-comment-placeholder'); | |
200 | renderInlineComments(file_comments); |
|
200 | renderInlineComments(file_comments); | |
201 |
|
201 | |||
202 | YUE.on(YUD.get('update_pull_request'),'click',function(e){ |
|
202 | YUE.on(YUD.get('update_pull_request'),'click',function(e){ | |
203 | updateReviewers(); |
|
203 | updateReviewers(); | |
204 | }) |
|
204 | }) |
@@ -94,7 +94,7 b'' | |||||
94 | ${h.submit('save',_('Save'),class_="ui-btn large")} |
|
94 | ${h.submit('save',_('Save'),class_="ui-btn large")} | |
95 | ${h.reset('reset',_('Reset'),class_="ui-btn large")} |
|
95 | ${h.reset('reset',_('Reset'),class_="ui-btn large")} | |
96 | </div> |
|
96 | </div> | |
97 |
|
97 | |||
98 | </div> |
|
98 | </div> | |
99 | ${h.end_form()} |
|
99 | ${h.end_form()} | |
100 | </div> |
|
100 | </div> |
General Comments 0
You need to be logged in to leave comments.
Login now