added plugin setting to show locked users

sourcepole · Oct 7, 2011 · 12ccdee · 12ccdee
1 parent bfd7395
commit 12ccdee
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/app/views/settings/_workload.html.erb b/app/views/settings/_workload.html.erb
@@ -1,4 +1,7 @@
 <p>
   <label><%= l(:default_measure) %></label>
   <%= select_tag "settings[workload_measure]", options_for_select(Workload::Workload::measures_for_select, @settings['workload_measure'].to_i) %>
+  <br/>
+  <label><%= l(:show_locked_users) %></label>
+  <%= check_box_tag "settings[workload_show_locked_users]", "1", @settings['workload_show_locked_users'] == "1" %>
 </p>
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -9,3 +9,4 @@ de:
   measure_free_capacity: Freie Kapazität
   measure_workload: Auslastung
   measure_availability: Verfügbarkeit
+  show_locked_users: Gesperrte Benutzer anzeigen
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -9,3 +9,4 @@ en:
   measure_free_capacity: Free capacity
   measure_workload: Workload
   measure_availability: Availability
+  show_locked_users: Show locked users
diff --git a/lib/workload/workload.rb b/lib/workload/workload.rb
@@ -149,7 +149,9 @@ def users
         :conditions => ["#{Issue.table_name}.assigned_to_id IS NOT NULL"],
         :order => "#{Project.table_name}.lft ASC, #{Issue.table_name}.id ASC",
         :limit => @max_rows
-      ).collect(&:assigned_to).uniq.reject{ |user| user.locked? }.uniq.sort{ |a,b| a.lastname <=> b.lastname }
+      ).collect(&:assigned_to).uniq.
+        reject{ |user| Setting.plugin_redmine_workload[:workload_show_locked_users] == "1" ? false : user.locked? }.
+        uniq.sort{ |a,b| a.lastname <=> b.lastname }
     end
 
     def render(options={})