Merge branch 'admin' of git@github.com:Smudge/newstc into admin

eladmeidar · Jul 15, 2009 · ed3ec5f · ed3ec5f
2 parents f77146a + be6e2a1
commit ed3ec5f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/models/department_config.rb b/app/models/department_config.rb
@@ -6,6 +6,11 @@ class DepartmentConfig < ActiveRecord::Base
   validates_numericality_of :time_increment, :grace_period, :schedule_start,
                             :schedule_end, :description_min, :reason_min, :warning_weeks
 
+  PAYFORM_PERIOD = [
+    ["Weekly",  false],
+    ["Monthly", true ]
+  ]
+
   WEEK_DAY_SELECT = [
     [Date::DAYNAMES[0], 0],
     [Date::DAYNAMES[1], 1],

diff --git a/app/views/department_configs/_form.html.erb b/app/views/department_configs/_form.html.erb
@@ -60,8 +60,8 @@
       <%= f.select :day, DepartmentConfig::WEEK_DAY_SELECT %>
     </p>
     <p>
-      <label>Monthly Payform Period (leave unchecked for weekly):</label>
-      <%= f.check_box :monthly %>
+      <label>Payform Period:</label>
+      <%= f.select :monthly, DepartmentConfig::PAYFORM_PERIOD %>
     </p>
     <p>
       <label>Show Disabled Categories on Payforms (rather than filing jobs under 'Miscellaneous'):</label>