engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

default-reviewers: fixed edit mode when creating new entries.

Browse source
This commit is contained in:
Marcin Kuzminski 2018-01-30 06:01:19 +01:00
parent e12af2ef40
commit 77c30a5643
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rhodecode/public/js/src/rhodecode/pullrequests.js
View file

@ -311,7 +311,8 @@ ReviewersController = function () {
'allowed_to_update': true,
'review_status': 'not_reviewed',
'review_status_label': _gettext('Not Reviewed'),
'reasons': reasons
'reasons': reasons,
'create': true
});
}
}

10
rhodecode/templates/ejs_templates/templates.html
View file

@ -34,13 +34,17 @@ var CG = new ColorGenerator();
<li id="reviewer_<%= member.user_id %>" class="reviewer_entry">
<%
if (create) {
var edit_visibility = 'visible';
} else {
var edit_visibility = 'hidden';
}
if (member.user_group && member.user_group.vote_rule) {
var groupStyle = 'border-left: 1px solid '+CG.asRGB(CG.getColor(member.user_group.vote_rule));
} else {
var groupStyle = 'border-left: 1px solid white';
}
%>
<div class="reviewers_member" style="<%= groupStyle%>" >
@ -99,12 +103,12 @@ var CG = new ColorGenerator();
<input type="hidden" name="__end__" value="reviewer:mapping">
<% if (mandatory) { %>
<div class="reviewer_member_mandatory_remove" style="visibility: hidden;">
<div class="reviewer_member_mandatory_remove" style="visibility: <%= edit_visibility %>;">
<i class="icon-remove-sign"></i>
</div>
<% } else { %>
<% if (allowed_to_update) { %>
<div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(<%= member.user_id %>, true)" style="visibility: hidden;">
<div class="reviewer_member_remove action_button" onclick="reviewersController.removeReviewMember(<%= member.user_id %>, true)" style="visibility: <%= edit_visibility %>;">
<i class="icon-remove-sign" ></i>
</div>
<% } %>

3
rhodecode/templates/pullrequests/pullrequest_show.mako
View file

@ -366,7 +366,8 @@
'allowed_to_update': allowed_to_update,
'review_status': status,
'review_status_label': status_lbl,
'user_group': member.user_group
'user_group': member.user_group,
'create': false
});
$('#review_members').append(entry)
</script>