Merge branch 'master' of https://github.com/nutso/redmine-plugin-recurring-tasks into develop

Author: nutso

app/models/recurring_task.rb

@@ -3,6 +3,8 @@ class RecurringTask < ActiveRecord::Base
 
   belongs_to :issue, :foreign_key => 'current_issue_id'
   has_one :project, :through => :issue
+
+  attr_accessible :id, :current_issue_id, :interval_number, :interval_modifier, :interval_unit, :fixed_schedule # list all fields that you want to be accessible here
 
   # these are the flags used in the database to denote the interval
   # the actual text displayed to the user is controlled in the language file
@@ -41,7 +43,7 @@ class RecurringTask < ActiveRecord::Base
   # for older Rails compatibility
   # validates_presence_of :interval_localized_name #41
   validates_presence_of :interval_unit
-  validates_presence_of :interval_modifier, :if => "interval_unit == INTERVAL_MONTH"
+  validates_presence_of :interval_modifier, :if => "interval_unit == RecurringTask::INTERVAL_MONTH"
 
   validates_presence_of :interval_number
 
@@ -53,7 +55,7 @@ class RecurringTask < ActiveRecord::Base
   validates_inclusion_of :interval_modifier,
     :in => RecurringTask::MONTH_MODIFIERS_LOCALIZED.keys,
     :message => "#{l(:error_invalid_modifier)} '%{value}' (Validation)",
-    :if => "interval_unit == INTERVAL_MONTH"
+    :if => "interval_unit == RecurringTask::INTERVAL_MONTH"
 
   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
@@ -247,7 +249,7 @@ def recur_issue_if_needed!
       new_issue.due_date = next_scheduled_recurrence #41 previous_date_for_recurrence + recurrence_pattern
       new_issue.start_date = new_issue.due_date
       new_issue.done_ratio = 0
-      new_issue.status = IssueStatus.default # issue status is NOT automatically new, default is whatever the default status for new issues is
+      new_issue.status = issue.tracker.default_status # issue status is NOT automatically new, default is whatever the default status for new issues is
       new_issue.save!
       puts "Recurring #{issue.id}: #{issue.subj_date}, created #{new_issue.id}: #{new_issue.subj_date}"
 

app/views/issues/_show_recurrence.html.erb

@@ -5,7 +5,7 @@
   <% end %>
   <p><strong><%= l(:field_recurrence).pluralize(2) %></strong></p>
   <% if issue.recurs? %>
-    <table class="list">
+    <table class="list" style="border-width: 0;">
     <tbody>
       <% issue.recurring_tasks.each do |rt| %>
         <tr>
@@ -47,4 +47,4 @@
 		<% end %>
 	</td>
 </tr>
--->
+-->

app/views/recurring_tasks/_form.html.erb

@@ -11,7 +11,7 @@
     <%= content_tag :div, :id => "interval_modifier_block", :style => modifier_display do -%>
       <p><%= f.select 'interval_modifier', rt.get_modifiers_descriptions.collect{|k,v| [v, k]} %></p>
     <% end -%>
-    <p><%= f.check_box :fixed_schedule, :checked => true %></p>
+    <p><%= f.check_box :fixed_schedule %></p>
   </div>
   <%= f.submit %>
   <%= link_to l(:button_cancel), :back %>

config/locales/fr.yml

@@ -1,15 +1,16 @@
 # French strings go here for Rails i18n
 fr:
-  label_recurring_tasks:    "Tâche planifiée"
+  label_recurring_tasks:    "Tâches planifiées"
+  label_recurring_task:     "Tâche planifiée"
   label_current_issue:      "Planifier la tâche"
-  label_recurrence_pattern: "Lancer la tâche tous les"
+  label_recurrence_pattern: "Exécuter la tâche tous les"
   label_add_recurring_task: "Planifier la tâche"
   label_no_recurring_tasks: "Aucune tâche planifiée n'a été trouvée dans le système."
   label_next_scheduled_run: "Prochaine exécution le"
   label_no_recurrence:      "Pas de planification."
   label_no_project:         "Pas de projet."
 
-  label_recurs_fixed: "à un rythme fixe"
+  label_recurs_fixed: "Regulièrement"
   label_recurs_dependent: "après la dernière fermeture de la demande"
 
   label_recurring_task_issue_empty: "N/A"
@@ -19,19 +20,28 @@ fr:
   label_assigned_to: "Assigné à"
 
   error_invalid_interval:   "Intervalle incorrect."
+  error_invalid_modifier:   "Le modificateurr d'interval est incorrect."
   error_recurring_task_not_found: "Pas de tâche planifiée trouvée. "
   error_recurring_task_could_not_remove: "Échec lors de la suppression de planification. "
 
   field_interval_number: "Nombre d'intervalles"
   field_interval_unit: "Unité d'intervalle"
+  field_interval_modifier: "Modifier l'intervaller"
   field_fixed_schedule: "Planification fixe ?"
   field_recurrence: "Planifié"
+  field_please_select: "--- Sélectionner ---"
 
   interval_day:  "jour"
   interval_week: "semaine"
   interval_month: "mois"
   interval_year: "année"
+  
+  month_modifier_day_from_first: "Le %{days_from_bom} jour"
+  month_modifier_day_to_last: "Le %{days_to_eom} Avant la fin"
+  month_modifier_dow_from_first: "Le %{dows_from_bom} %{day_of_week}"
+  month_modifier_dow_to_last: "Le %{dows_to_eom} avant la fin %{day_of_week}"
 
+  
   recurring_task_created: "Planification créée. "
   recurring_task_saved: "Planification sauvegardé. "
   recurring_task_removed: "Planification supprimée. "

config/routes.rb

@@ -1,13 +1,13 @@
 # resources :recurring_tasks
 
 # admin view
-match 'recurring_tasks', :to => 'recurring_tasks#index'
+match 'recurring_tasks', :to => 'recurring_tasks#index', :as => :index_recurring_tasks, :via => 'get'
 
 # project view 
-match 'projects/:project_id/recurring_tasks', :to => 'recurring_tasks#index', :as => :recurring_tasks
-match 'projects/:project_id/recurring_tasks/new(/:issue_id)', :to => 'recurring_tasks#new', :as => :new_recurring_task
-match 'projects/:project_id/recurring_tasks/create', :to => 'recurring_tasks#create'
-match 'projects/:project_id/recurring_tasks/:id', :to => 'recurring_tasks#show', :as => :recurring_task
-match 'projects/:project_id/recurring_tasks/:id/edit', :to => 'recurring_tasks#edit', :as => :edit_recurring_task
-match 'projects/:project_id/recurring_tasks/:id/update', :to => 'recurring_tasks#update'
-match 'projects/:project_id/recurring_tasks/:id/destroy', :to => 'recurring_tasks#destroy', :as => :destroy_recurring_task
+match 'projects/:project_id/recurring_tasks', :to => 'recurring_tasks#index', :as => :recurring_tasks, :via => 'get'
+match 'projects/:project_id/recurring_tasks/new(/:issue_id)', :to => 'recurring_tasks#new', :as => :new_recurring_task, :via => 'get'
+match 'projects/:project_id/recurring_tasks/create', :to => 'recurring_tasks#create', :via => 'post'
+match 'projects/:project_id/recurring_tasks/:id', :to => 'recurring_tasks#show', :as => :recurring_task, :via => 'get'
+match 'projects/:project_id/recurring_tasks/:id/edit', :to => 'recurring_tasks#edit', :as => :edit_recurring_task, :via => 'get'
+match 'projects/:project_id/recurring_tasks/:id/update', :to => 'recurring_tasks#update', :via => [:get, :post, :patch]
+match 'projects/:project_id/recurring_tasks/:id/destroy', :to => 'recurring_tasks#destroy', :as => :destroy_recurring_task, :via => [:post, :delete]