Skip to content

Commit bfd5b91

Browse files
committed
Hide options when permission is not given.
git-svn-id: http://svn.redmine.org/redmine/trunk@15468 e93f8b46-1217-0410-a6f0-8f06a7374b81
1 parent 2691613 commit bfd5b91

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

app/views/roles/_form.html.erb

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
<% end %>
88

99
<% unless @role.anonymous? %>
10-
<p><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
10+
<p class="view_issues_shown"><%= f.select :issues_visibility, Role::ISSUES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
1111
<% end %>
1212

1313
<% unless @role.anonymous? %>
14-
<p><%= f.select :time_entries_visibility, Role::TIME_ENTRIES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
14+
<p class="view_time_entries_shown"><%= f.select :time_entries_visibility, Role::TIME_ENTRIES_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]}, {}, :class => "view_time_entries_enabled" %></p>
1515
<% end %>
1616

1717
<p><%= f.select :users_visibility, Role::USERS_VISIBILITY_OPTIONS.collect {|v| [l(v.last), v.first]} %></p>
1818

1919
<% unless @role.builtin? %>
20-
<p id="manage_members_options">
20+
<p class="manage_members_shown">
2121
<label><%= l(:label_member_management) %></label>
2222
<label class="block">
2323
<%= radio_button_tag 'role[all_roles_managed]', 1, @role.all_roles_managed?, :id => 'role_all_roles_managed_on',
@@ -52,7 +52,8 @@
5252
<% perms_by_module[mod].each do |permission| %>
5353
<label class="floating">
5454
<%= check_box_tag 'role[permissions][]', permission.name, (@role.permissions.include? permission.name),
55-
:id => "role_permissions_#{permission.name}" %>
55+
:id => "role_permissions_#{permission.name}",
56+
:data => {:shows => ".#{permission.name}_shown"} %>
5657
<%= l_or_humanize(permission.name, :prefix => 'permission_') %>
5758
</label>
5859
<% end %>
@@ -62,7 +63,7 @@
6263
<%= hidden_field_tag 'role[permissions][]', '' %>
6364
</div>
6465

65-
<div id="role-permissions-trackers">
66+
<div id="role-permissions-trackers" class="view_issues_shown">
6667
<h3><%= l(:label_issue_tracking) %></h3>
6768
<% permissions = %w(view_issues add_issues edit_issues add_issue_notes delete_issues) %>
6869

@@ -72,18 +73,19 @@
7273
<tr>
7374
<th><%= l(:label_tracker) %></th>
7475
<% permissions.each do |permission| %>
75-
<th><%= l("permission_#{permission}") %></th>
76+
<th class="<%= "#{permission}_shown" %>"><%= l("permission_#{permission}") %></th>
7677
<% end %>
7778
</thead>
7879
<tbody>
7980
<tr>
8081
<td class="name"><b><%= l(:label_tracker_all) %></b></td>
8182
<% permissions.each do |permission| %>
82-
<td>
83+
<td class="<%= "#{permission}_shown" %>">
8384
<%= hidden_field_tag "role[permissions_all_trackers][#{permission}]", '0', :id => nil %>
8485
<%= check_box_tag "role[permissions_all_trackers][#{permission}]",
8586
'1',
8687
@role.permissions_all_trackers?(permission),
88+
:class => "#{permission}_shown",
8789
:data => {:disables => ".#{permission}_tracker"} %>
8890
</td>
8991
<% end %>
@@ -92,7 +94,7 @@
9294
<tr class="<%= cycle("odd", "even") %>">
9395
<td class="name"><%= tracker.name %></td>
9496
<% permissions.each do |permission| %>
95-
<td><%= check_box_tag "role[permissions_tracker_ids][#{permission}][]",
97+
<td class="<%= "#{permission}_shown" %>"><%= check_box_tag "role[permissions_tracker_ids][#{permission}][]",
9698
tracker.id,
9799
@role.permissions_tracker_ids?(permission, tracker.id),
98100
:class => "#{permission}_tracker",
@@ -108,11 +110,3 @@
108110
<%= hidden_field_tag "role[permissions_tracker_ids][#{permission}][]", '' %>
109111
<% end %>
110112
</div>
111-
112-
<%= javascript_tag do %>
113-
$(document).ready(function(){
114-
$("#role_permissions_manage_members").change(function(){
115-
$("#manage_members_options").toggle($(this).is(":checked"));
116-
}).change();
117-
});
118-
<% end %>

public/javascripts/application.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -719,9 +719,10 @@ function toggleDisabledOnChange() {
719719
var checked = $(this).is(':checked');
720720
$($(this).data('disables')).attr('disabled', checked);
721721
$($(this).data('enables')).attr('disabled', !checked);
722+
$($(this).data('shows')).toggle(checked);
722723
}
723724
function toggleDisabledInit() {
724-
$('input[data-disables], input[data-enables]').each(toggleDisabledOnChange);
725+
$('input[data-disables], input[data-enables], input[data-shows]').each(toggleDisabledOnChange);
725726
}
726727

727728
(function ( $ ) {
@@ -751,7 +752,7 @@ function toggleDisabledInit() {
751752
}( jQuery ));
752753

753754
$(document).ready(function(){
754-
$('#content').on('change', 'input[data-disables], input[data-enables]', toggleDisabledOnChange);
755+
$('#content').on('change', 'input[data-disables], input[data-enables], input[data-shows]', toggleDisabledOnChange);
755756
toggleDisabledInit();
756757
});
757758

0 commit comments

Comments
 (0)