diff options
3 files changed, 10 insertions, 10 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb index cd5385ef39e..f82cbee29b6 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/helpers/application_helper.rb @@ -122,9 +122,9 @@ module ApplicationHelper def boolean_icon(boolean_value, options={}) if boolean_value - image_tag('tick.png') + image_tag('tick.png', options) elsif options[:display_false] - image_tag('cross.png') + image_tag('cross.png', options) else nil end diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb index 9164ce3927d..cbfad4250d7 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb @@ -22,7 +22,7 @@ <div class="description"><%= h dashboard.description -%></div> </td> <td class="shared"> - <%= boolean_icon(dashboard.shared) -%> + <%= boolean_icon(dashboard.shared, {:id => "dashboard-#{index}-shared"}) -%> </td> <td class="owner"> <%= h(dashboard.user_name || message('dashboard.username.default')) -%> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb index e8489ee6041..1d8524e0ed7 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/roles/global.html.erb @@ -9,18 +9,18 @@ </tr> </thead> <tbody> - <% ['admin', 'profileadmin', 'shareDashboard', 'scan', 'dryrun'].each do |global_permissions| %> + <% ['admin', 'profileadmin', 'shareDashboard', 'scan', 'dryrun'].each do |global_permission| %> <tr class="<%= cycle('even', 'odd', :name => 'global_permission') -%>" > <td valign="top"> - <b><%= message('global_permissions.' + global_permissions) -%></b><br/> - <span class="small gray"><%= message('global_permissions.' + global_permissions + '.desc') -%></span></td> + <b><%= message('global_permissions.' + global_permission) -%></b><br/> + <span class="small gray"><%= message('global_permissions.' + global_permission + '.desc') -%></span></td> <td valign="top" style="word-break:break-all;width:30%;"> - <span><%= users(global_permissions).map(&:name).join(', ') -%></span> - (<%= link_to "select", {:action => 'edit_users', :role => global_permissions, :redirect => 'global'}, :class => 'link-action' -%>) + <span><%= users(global_permission).map(&:name).join(', ') -%></span> + (<%= link_to "select", {:action => 'edit_users', :role => global_permission, :redirect => 'global'}, :class => 'link-action', :id => "select-users-#{global_permission}" -%>) </td> <td valign="top" style="word-break:break-all;width:30%;"> - <span><%= groups(global_permissions).map{|g| group_name(g)}.join(', ') %></span> - (<%= link_to "select", {:action => 'edit_groups', :role => global_permissions, :redirect => 'global'}, :class => 'link-action' -%>) + <span><%= groups(global_permission).map{|g| group_name(g)}.join(', ') %></span> + (<%= link_to "select", {:action => 'edit_groups', :role => global_permission, :redirect => 'global'}, :class => 'link-action', :id => "select-groups-#{global_permission}" -%>) </td> </tr> <% end %> |