Merge pull request #24 from nutso/develop

Develop

Author: teresan

ReleaseNotes.md

@@ -14,45 +14,47 @@
 ## Resolved in Develop (Next Version)
 
 * Using validates_presence_of instead of validates :x, presence: true for backward Rails compatibility (#20)
+* Using validates_inclusion_of and validates_numericality_of instead of stand-alone validates for backward Rails compatibility (#20)
+* Creating a new recurrence sets interval_unit properly from localized name
 
-## Version 1.2.7
+## Version 1.2.7 (04 Jan 2014)
 
 * Changed to more traditional :through => :issue instead of through: :issue for backward Rails compatibility (#20)
 
-## Version 1.2.6
+## Version 1.2.6 (04 Jan 2014)
 
 * After deleting an issue that still has a recurrence, recurrence views generate errors
 * Menu captions not localized (#21)
 * Changing the interval_day, interval_week, interval_month, or interval_year strings in the locale file, or changing locales, after adding recurrences generates an error
 
-## Version 1.2.5
+## Version 1.2.5 (30 Dec 2013)
 
 * resolved nil reference for fixed schedule recurrences with no due date (#16)
 * includes german translation contributed by @skolarianer
 
-## Version 1.2.0
+## Version 1.2.0 (29 Dec 2013)
 
 * more intuitive management within the issues themselves
 * add link to add recurrence when viewing an issue (#7)
 * display existing recurrence if application when viewing an issue (#6)
 
-## Version 1.1.0
+## Version 1.1.0 (28 Dec 2013)
 
 * Project-specific recurring tasks view (#11)
 * Better permissions (managed under issues) (#12)
 
-## Version 1.0.2
+## Version 1.0.2 (26 Dec 2013)
 
 * Show next scheduled recurrence when displaying a recurring task (#9)
 * Add more than one recurrence to 'catch up' if warranted when recurring (#10)
 * Localized date format display
 
-## Version 1.0.1
+## Version 1.0.1 (25 Dec 2013)
 
 * Added missing translations
 * Fixed missing routes (#1)
 
-## Version 1.0.0
+## Version 1.0.0 (21 Dec 2013)
 
 * Initial functionality to configure recurring tasks. 
 * Any task can be set to recur on a fixed (e.g. every Monday) 

app/controllers/recurring_tasks_controller.rb

@@ -26,6 +26,7 @@ def new
 
   # creates a new recurring task
   def create
+    params[:recurring_task][:interval_unit] = RecurringTask.get_interval_from_localized_name(params[:recurring_task][:interval_localized_name])
     @recurring_task = RecurringTask.new(params[:recurring_task])
     if @recurring_task.save
       flash[:notice] = l(:recurring_task_created)

app/models/recurring_task.rb

@@ -19,26 +19,30 @@ class RecurringTask < ActiveRecord::Base
   validates_presence_of :interval_localized_name
   validates_presence_of :interval_number
 
-  validates :interval_localized_name, inclusion: { in: RecurringTask::INTERVAL_UNITS_LOCALIZED, message: "#{l(:error_invalid_interval)} '%{value}' (Validation)" }
-  validates :interval_number, numericality: {only_integer: true, greater_than: 0}
+  validates_inclusion_of :interval_localized_name, :in => RecurringTask::INTERVAL_UNITS_LOCALIZED, :message => "#{l(:error_invalid_interval)} '%{value}' (Validation)"
+  validates_numericality_of :interval_number, :only_integer => true, :greater_than => 0
   # cannot validate presence of issue if want to use other features; requiring presence of fixed_schedule requires it to be true
 
   validates_associated :issue # just in case we build in functionality to add an issue at the same time, verify the issue is ok  
 
   # text for the interval name
   def interval_localized_name
-    case interval_unit
-    when INTERVAL_DAY
-      l(:interval_day)
-    when INTERVAL_WEEK
-      l(:interval_week)
-    when INTERVAL_MONTH
-      l(:interval_month)
-    when INTERVAL_YEAR
-      l(:interval_year)
+    if new_record?
+      @interval_localized_name
     else
-      raise "#{l(:error_invalid_interval)} #{interval_unit} (interval_localized_name)"
-    end  
+      case interval_unit
+      when INTERVAL_DAY
+        l(:interval_day)
+      when INTERVAL_WEEK
+        l(:interval_week)
+      when INTERVAL_MONTH
+        l(:interval_month)
+      when INTERVAL_YEAR
+        l(:interval_year)
+      else
+        raise "#{l(:error_invalid_interval)} #{interval_unit} (interval_localized_name)"
+      end
+    end
   end
 
   # interval database name for the localized text

app/views/recurring_tasks/index.html.erb

@@ -20,15 +20,14 @@
             <% @recurring_tasks.each do |rt| %>
 	            <tr class="<%= cycle('odd', 'even') %>">
             	<% begin %>
-	            	<% logger.info rt.id %>
-	                	<% if @project.nil? %><td><%= rt.project.nil? ? l(:label_recurring_task_project_empty) : link_to(rt.project, project_path(rt.project)) %></td><% end %>
-	                    <td><%= rt.issue.nil? ? l(:label_recurring_task_issue_empty) : link_to(rt.issue.subj_date, {:action => 'show', :id => rt.id, :project_id => rt.project.id}) %></td>
-	                    <td><%= pluralize(rt.interval_number, rt.interval_localized_name) %></td>
-	                    <td><%= rt.fixed_schedule %></td>
-	                    <td><%= format_date(rt.next_scheduled_recurrence) %></td>
-	                    <td><%= edit_button rt %></td>
+                	<% if @project.nil? %><td><%= rt.project.nil? ? l(:label_recurring_task_project_empty) : link_to(rt.project, project_path(rt.project)) %></td><% end %>
+                    <td><%= rt.issue.nil? ? l(:label_recurring_task_issue_empty) : link_to(rt.issue.subj_date, {:action => 'show', :id => rt.id, :project_id => rt.project.id}) %></td>
+                    <td><%= pluralize(rt.interval_number, rt.interval_localized_name) %></td>
+                    <td><%= rt.fixed_schedule %></td>
+                    <td><%= format_date(rt.next_scheduled_recurrence) %></td>
+                    <td><%= edit_button rt %></td>
 	             <% rescue => e %>
-	             		<td><%= "ERROR: #{e}" %></td>
+	             	<td><%= "ERROR: #{e}" %></td>
 	             <% end %>
 	             </tr>
             <% end %>

app/views/recurring_tasks/show.html.erb

@@ -4,10 +4,15 @@
 
 <h2><%= @recurring_task.issue.nil? ? l(:label_recurring_task_issue_empty) : link_to(@recurring_task.issue.subj_date, {:controller => 'issues', :action => 'show', :id => @recurring_task.issue.id}) %></h2>
 
+<% begin %>
 <p><%= l(:label_recurrence_pattern) %> <%= pluralize(@recurring_task.interval_number, @recurring_task.interval_localized_name) %></p>
 <p><%= @recurring_task.fixed_schedule ? l(:label_recurs_fixed) : l(:label_recurs_dependent) %></p>
 
 <p><%= l(:label_next_scheduled_run) %>: <%= format_date(@recurring_task.next_scheduled_recurrence) %></p>
 
+<% rescue Exception => e
+logger.error(e)
+end %>
+
 <p><%= edit_button @recurring_task %></p>
 <p><%= delete_button @recurring_task %></p>