Merge pull request #14 from nutso/develop

v1.1.0 project-specific recurring tasks

Author: teresan

app/controllers/recurring_tasks_controller.rb

@@ -2,11 +2,15 @@ class RecurringTasksController < ApplicationController
   include RecurringTasksHelper
   unloadable
 
+  # before_filter :authorize, :except => :index # not sure why index is excluded, but this is true for issues ...
+  before_filter :find_optional_project # this also checks permissions
   before_filter :find_recurring_task, :except => [:index, :new, :create]
   before_filter :set_interval_units, :except => [:index, :show]
 
   def index
-    @recurring_tasks = RecurringTask.all
+    # TODO authorize
+
+    @recurring_tasks = RecurringTask.all_for_project(@project)
   end
 
   def show
@@ -59,6 +63,17 @@ def destroy
   end
 
 private
+#  def find_project
+#    @project = nil
+#    if params[:project_id]
+#      begin
+#        @project = Project.find(params[:project_id])
+#      rescue ActiveRecord::RecordNotFound
+#        show_error "#{l(:error_project_not_found)} #{params[:project_id]}" # TODO localize
+##      end
+#    end
+#  end
+
   def find_recurring_task
     begin
       @recurring_task = RecurringTask.find(params[:id])

app/helpers/recurring_tasks_helper.rb

@@ -3,4 +3,16 @@ def show_error msg
     logger.error msg
     render_error :message => msg    
   end
+  
+  def delete_button recurring_task
+    if User.current.allowed_to?(:delete_issue_recurrence, recurring_task.project)
+      button_to(l(:button_delete), {:action => 'destroy', :id => recurring_task}, :method => :delete, :class => 'icon icon-del', :confirm => l(:text_are_you_sure))
+    end
+  end
+  
+  def edit_button recurring_task
+    if User.current.allowed_to?(:edit_issue_recurrence, recurring_task.project)
+      link_to(l(:button_edit), {:action => 'edit', :id => recurring_task}, :class => 'icon icon-edit')
+    end
+  end
 end

app/models/recurring_task.rb

@@ -2,6 +2,7 @@ class RecurringTask < ActiveRecord::Base
   unloadable
 
   belongs_to :issue, :foreign_key => 'current_issue_id'
+  has_one :project, through: :issue
 
   # must come before validations otherwise unitialized
   INTERVAL_UNITS = [l(:interval_day), l(:interval_week), l(:interval_month), l(:interval_year)]
@@ -30,6 +31,11 @@ def recurrence_pattern
     end
   end
 
+  # retrieve all recurring tasks given a project
+  def self.all_for_project project
+    if project.nil? then all else RecurringTask.includes(:issue).where("issues.project_id" => project.id) end
+  end
+  
   # next due date for the task, if there is one (relative tasks won't have a next schedule until the current issue is closed)
   def next_scheduled_recurrence
     previous_date_for_recurrence + recurrence_pattern unless previous_date_for_recurrence.nil?

app/views/recurring_tasks/edit.html.erb

@@ -3,4 +3,4 @@
 <%= render partial: "form", locals: {next_step: 'update', rt: @recurring_task} %>
 
 <p><%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-task")' %></p>
-<p><%= button_to(l(:button_delete), {:action => 'destroy', :id => @recurring_task}, :method => :delete, :class => 'icon icon-del', :confirm => l(:text_are_you_sure)) %></p>
+<p><%= delete_button @recurring_task %></p>

app/views/recurring_tasks/index.html.erb

@@ -4,7 +4,7 @@
     <%= link_to(l(:label_add_recurring_task), {:action => 'new'}, :class => 'icon icon-add') %>
 </div>
 
-<% if @recurring_tasks.empty? %>
+<% if @recurring_tasks.nil? or @recurring_tasks.empty? %>
     <p><%= l(:label_no_recurring_tasks)%></p>
 
 <% else %>
@@ -16,7 +16,7 @@
                <th><%= l(:label_recurrence_pattern)%></th>
                <th><%= l(:field_fixed_schedule)%></th>
                <th><%= l(:label_next_scheduled_run) %></th>
-               <th><%= l(:button_edit) %></th>
+               <th>&nbsp;</th>
             </tr>
         </thead>
         <tbody>
@@ -26,7 +26,7 @@
                     <td><%= pluralize(rt.interval_number, rt.interval_unit) %></td>
                     <td><%= rt.fixed_schedule %></td>
                     <td><%= format_date(rt.next_scheduled_recurrence) %></td>
-                    <td><%= link_to(l(:button_edit), {:action => 'edit', :id => rt.id}, :class => 'icon icon-edit') %></td>
+                    <td><%= edit_button rt %></td>
                 </tr>
             <% end %>
         </tbody>

app/views/recurring_tasks/show.html.erb

@@ -9,5 +9,5 @@
 
 <p><%= l(:label_next_scheduled_run) %>: <%= format_date(@recurring_task.next_scheduled_recurrence) %></p>
 
-<p><%= button_to(l(:button_edit), {:action => 'edit', :id => @recurring_task}, :class => 'icon icon-edit')%></p>
-<p><%= button_to(l(:button_delete), {:action => 'destroy', :id => @recurring_task}, :method => :delete, :class => 'icon icon-del', :confirm => l(:text_are_you_sure)) %></p>
+<p><%= edit_button @recurring_task %></p>
+<p><%= delete_button @recurring_task %></p>

config/routes.rb

@@ -1,9 +1,13 @@
-resources :recurring_tasks
+# resources :recurring_tasks
 
-# match 'recurring_tasks', :to => 'recurring_tasks#index'
-# match 'recurring_tasks/new', :to => 'recurring_tasks#new'
-# match 'recurring_tasks/create', :to => 'recurring_tasks#create', :via => [:post]
-# match 'recurring_tasks/:id/show', :to => 'recurring_tasks#show'
-# match 'recurring_tasks/:id/edit', :to => 'recurring_tasks#edit'
-# match 'recurring_tasks/:id/update', :to => 'recurring_tasks#update', :via => [:patch, :put]
-# match 'recurring_tasks/:id/destroy', :to => 'recurring_tasks#destroy', :via => [:delete]
+# admin view
+match 'recurring_tasks', :to => 'recurring_tasks#index'
+
+# project view 
+match 'projects/:project_id/recurring_tasks', :to => 'recurring_tasks#index'
+match 'projects/:project_id/recurring_tasks/:id', :to => 'recurring_tasks#show'
+match 'projects/:project_id/recurring_tasks/new', :to => 'recurring_tasks#new'
+match 'projects/:project_id/recurring_tasks/create', :to => 'recurring_tasks#create'
+match 'projects/:project_id/recurring_tasks/:id/edit', :to => 'recurring_tasks#edit'
+match 'projects/:project_id/recurring_tasks/:id/update', :to => 'recurring_tasks#update'
+match 'projects/:project_id/recurring_tasks/:id/destroy', :to => 'recurring_tasks#destroy'

init.rb

@@ -1,25 +1,29 @@
 require 'issues_patch'
 
 Redmine::Plugin.register :recurring_tasks do
-  name 'Recurring Tasks'
+  name 'Recurring Tasks (Issues)'
   author 'Teresa N.'
   author_url 'https://github.com/nutso/'
   url 'https://github.com/nutso/redmine-plugin-recurring-tasks'
   description 'Allows you to set a task to recur on a regular schedule, or when marked complete, regenerate a new task due in the future. Plugin is based -- very loosely -- on the periodic tasks plugin published by Tanguy de Courson'
-  version '1.0.2'
+  version '1.1.0'
 
-  menu :top_menu, :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => 'Recurring Tasks'
+  Redmine::MenuManager.map :top_menu do |menu|
+    menu.push :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => 'Recurring Issues', :if => Proc.new { User.current.admin? } # TODO localize string
+  end
 
-  # TODO project-specific recurring tasks view (#11)
-  # menu :project_menu, :periodic_tasks, { :controller => 'periodic_tasks', :action => 'index' }, :caption => 'Periodic Task', :after => :settings, :param => :project_id
+  # Permissions map to issue permissions (#12)
+  # Modeled after #{redmine root}/lib/redmine.rb permissions setup
+  project_module :issue_tracking do
+    permission :view_issue_recurrence,   {:recurring_tasks => [:index, :show]}, :read => true
+    permission :add_issue_recurrence,    {:recurring_tasks => [:new, :create]}
+    permission :edit_issue_recurrence,   {:recurring_tasks => [:edit, :update]}
+    permission :delete_issue_recurrence, {:recurring_tasks => [:destroy]}, :require => :member
+  end
 
-  # TODO better permissions (#12)
+  # project-specific recurring tasks view (#11)
+  menu :project_menu, :recurring_tasks, { :controller => 'recurring_tasks', :action => 'index' }, :caption => 'Recurring Issues', :after => :new_issue, :param => :project_id # TODO localize string
 
-  #  project_module :recurring_tasks do
-  #    permission :recurring_tasks, {:recurring_tasks => [:index, :edit]}
-  #  end
-
-
   # Send patches to models and controllers
   Rails.configuration.to_prepare do
     Issue.send(:include, RecurringTasks::IssuePatch)