stuff_to_do for redmine 2.0 with rails 3 (Feature #6551)

CREDITS.txt

@@ -1,6 +1,17 @@
 Thanks go to the following people for patches and contributions:
 
+1. Original Version
+
 * Eric Davis of Little Stream Software - Project Maintainer
 * Tim Haskins of Copious Creative - Project sponsorship
 * Bill Tihen of Leysin American School - Project sponsorship
 * The many translators who have submitted patches
+
+2. development since 2012
+
+* Steffen Schüssler <[email protected]>
+* Rumega
+* ande3577
+* wojts
+* JohnBat27
+* JangoSteve

Gemfile

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem "acts_as_list"
+# since rails 5
+gem "record_tag_helper"
+
+group :test do
+  gem "rails-controller-testing"
+end

README.rdoc → README.md

@@ -1,8 +1,13 @@
-= Redmine Stuff To Do Plugin
+# Redmine Stuff To Do Plugin
 
 The Stuff To Do plugin allows a user to order and prioritize the issues and projects they are doing into a specific order. It will also allow other privileged users to reorder the user's workload.
+Master branch supports redmine version 3.x and up. For previous versions use the compatible branches.
 
-== Features
+![StuffToDo](img/StuffToDo.png "Stuff to Do")
+
+![StuffToDo-Issues](img/StuffToDo-Issue.png "Stuff to Do - Issues Page")
+
+## Features
 
 * Sorting and prioritizing of cross-project To Do lists
 * Easy to use drag and drop interface
@@ -11,36 +16,49 @@ The Stuff To Do plugin allows a user to order and prioritize the issues and proj
 * Notification emails based on low workload counts
 * Drag and drop time logging using the Time Grid
 
-== Getting the plugin
+## Getting the plugin
 
-A copy of the plugin can be downloaded from {Little Stream Software}[https://projects.littlestreamsoftware.com/projects/redmine-stuff-to-do/files] or from {GitHub}[http://github.com/edavis10/redmine-stuff-to-do]
+A copy of the plugin can be downloaded for original versions from Little Stream Software or for newer versions from [GitHub](https://github.com/neffets/redmine-stuff-to-do-plugin). 
 
 
-== Installation and Setup
+## Installation and Setup
 
-1. Follow the Redmine plugin installation steps at: http://www.redmine.org/wiki/redmine/Plugins  Make sure the plugin is installed to +vendor/plugins/stuff_to_do_plugin+
-2. Run the plugin migrations +rake db:migrate_plugins+
+1. Follow the Redmine plugin installation steps at: https://www.redmine.org/projects/redmine/wiki/Plugins
+   * for redmine>=2.x/>=rails3: Make sure the plugin is installed to: *plugins/stuff_to_do_plugin*
+2. Run the plugin migrations
+   * for redmine>=2.x/>=rails3: *rake redmine:plugins:migrate*
 3. Restart your Redmine web servers (e.g. mongrel, thin, mod_rails)
 4. Login and configure the plugin (Administration > Plugins > Configure)
-5. Click the Stuff To Do link in the top left menu
+5. Setup permissions
+  1.  Use Stuff to Do - allow a user to manage their own Stuff to Do list
+  2. View Others Stuff to Do - allow a user to view the Stuff to Do list of their assignees (set in account/user settings)
+  3.  View all users stuff to do - view the stuff to do of all users, even if they are not your assignee
+  4.  Manage Stuff to Do Reportees - allow a user to select whose Stuff to Do list they can view
+  5.  View All Reportee Issues - when viewing another's stuff to do list, view all available issues, even if they would not normally be visible to the current user
+  6.  View All Reportee Stuff to Do - when viewing another's stuff to do list, view all issues that are currently in their Doing Now and Recommended lists
+6. Click the Stuff To Do link in the top left menu
 
-== Usage
+## Usage
 
 There are three panes that can be sorted:
 
-=== What I'm doing now
+### What I'm doing now
 
 This pane lists the next 5 items a user is supposed to be working on.  These items should be the *most* important things assigned to the user.  As the user closes an item, the items lower in the list will rise up and fill in this pane.  Items are closed by either closing the issue (Issues) or archiving a project (Project)
 
-=== What's recommended to do next
+### What's recommended to do next
 
 This pane lists extra items for the user.  These items are used as overflow for the What I'm doing now.
 
-=== What's available
+### What's available
 
 This pane lists all the open issues that are assigned to the user or the projects visible to the user.  They are the pool of things that a user can draw on as they work.
 
-=== Workflow
+### Time grid
+
+TODO: describe the "time_grid" feature
+
+### Workflow
 
 The standard workflow for this plugin is as follows:
 
@@ -51,11 +69,11 @@ The standard workflow for this plugin is as follows:
 
 If the user is an Administrator, they have the permission to edit other users' lists.  This allows them to act as the system Project Manager.
 
-== License
+## License
 
-This plugin is licensed under the GNU GPL v2.  See COPYRIGHT.txt and GPL.txt for details.
+This plugin is licensed under the GNU GPL v3.  See COPYRIGHT.txt and GPL.txt for details.
 
-== Project help
+## Project help
 
-If you need help you can contact the maintainer at his email address (See CREDITS.txt) or create an issue in the Bug Tracker.  The bug tracker is located at  https://projects.littlestreamsoftware.com
+If you need help you can contact the maintainer at his email address (See CREDITS.txt) or comment on github. If You are a developer feel free to fork und pull Your changes on github.
 

VERSION

@@ -1 +1 @@
-0.4.0
+0.7.1

app/controllers/stuff_to_do_controller.rb

@@ -1,54 +1,93 @@
 class StuffToDoController < ApplicationController
   unloadable
 
-  before_filter :get_user
-  before_filter :get_time_grid, :only => [:index, :time_grid]
-  before_filter :require_admin, :only => :available_issues
+  include StuffToDoHelper
+
+  before_action :get_user, :get_project
+  before_action :get_time_grid, only: [:index, :time_grid]
   helper :stuff_to_do
   helper :custom_fields
   helper :timelog
 
   def index
     @doing_now = StuffToDo.doing_now(@user)
     @recommended = StuffToDo.recommended(@user)
-    @available = StuffToDo.available(@user, default_filters )
-
-    @users = User.active
+    @available = StuffToDo.available(@user, @project, default_filters )
+
+    @users = StuffToDoReportee.reportees_for(User.current)
+    @users << User.current unless @users.include?(User.current)
     @filters = filters_for_view
+
+    respond_to do |format|
+      format.html { render template: 'stuff_to_do/index', layout: !request.xhr? }
+      format.csv  { send_data(stuff_to_do_to_csv(@doing_now, @recommended, @available, @user, params), type: 'text/csv; header=present', filename: 'export.csv') }
+    end
+  end
+
+  def delete
+    if !params[:issue_id].nil? && !params[:user_id].nil?
+      StuffToDo.remove(params[:user_id],  params[:issue_id] )
+    end
+
+    respond_to do |format|
+      format.html { redirect_to_referer_or { render text: ('Deleting Issue from stuff-to-do.'), layout: true} }
+      format.js { render partial: 'stuff-to-do', layout: false}
+    end
   end
 
+  def add
+    if !params[:issue_id].nil? && !params[:user_id].nil?
+      StuffToDo.add(params[:user_id], params[:issue_id], params[:to_front] == "true")         
+    end
+    respond_to do |format|
+      format.html { redirect_to_referer_or { render text: ('Adding issue to stuff-to-do.'), layout: true} }
+      format.js { render partial: 'stuff-to-do', layout: false}
+    end
+  end
+
   def reorder
     StuffToDo.reorder_list(@user, params[:stuff])
     @doing_now = StuffToDo.doing_now(@user)
     @recommended = StuffToDo.recommended(@user)
-    @available = StuffToDo.available(@user, get_filters )
+    @available = StuffToDo.available(@user, @project, get_filters )
 
     respond_to do |format|
-      format.html { redirect_to :action => 'index'}
-      format.js { render :partial => 'panes', :layout => false}
+      format.html { redirect_to action: 'index'}
+      format.js { render partial: 'panes', layout: false}
     end
   end
 
   def available_issues
-    @available = StuffToDo.available(@user, get_filters)
+    @available = StuffToDo.available(@user, @project, get_filters)
+
+    respond_to do |format|
+      format.html { redirect_to action: 'index'}
+      format.js { render partial: 'right_panes', layout: false}
+    end
+  end
+
+  def clear
+    StuffToDo.where(user_id: @user).destroy_all
 
     respond_to do |format|
-      format.html { redirect_to :action => 'index'}
-      format.js { render :partial => 'right_panes', :layout => false}
+      format.html { redirect_to action: 'index', user_id: @user }
+      format.js { redirect_to action: 'index', user_id: @user }
     end
   end
 
   def time_grid
+    get_time_grid
+    Rails.logger.debug "get_time_grid issues = #{@spent_issues.inspect}"
     respond_to do |format|
-      format.html { redirect_to :action => 'index'}
-      format.js { render :partial => 'time_grid', :layout => false}
+      format.html { redirect_to action: 'index'}
+      format.js { render partial: 'time_grid', layout: false}
     end
   end
 
   def add_to_time_grid
     issue = Issue.visible.find_by_id(params[:issue_id])
     # Issue exists and isn't already in user's list
-    if issue && !User.current.time_grid_issues.exists?(issue)
+    if issue && !User.current.time_grid_issues.exists?(issue.id)
       User.current.time_grid_issues << issue
     end
     get_time_grid
@@ -66,7 +105,8 @@ def save_time_entry
     @time_entry = TimeEntry.new
     @time_entry.user = User.current
     if params[:time_entry] &&  params[:time_entry].first
-      @time_entry.attributes = params[:time_entry].first
+      @time_entry.safe_attributes = params[:time_entry].first
+      # [ :issue_id, :spent_on, :hours, :comments, :activity_id ]
     end
     @time_entry.project = @time_entry.issue.project if @time_entry.issue
     respond_to do |format|
@@ -76,18 +116,28 @@ def save_time_entry
 
         format.js { time_grid }
       else
-        format.js { render :text => @time_entry.errors.full_messages.join(', '), :status => 403, :layout => false }
+        format.js { render text: @time_entry.errors.full_messages.join(', '), status: 403, layout: false }
       end
     end
   end
 
   private
 
+  def get_project
+    if params[:project_id] && !params[:project_id].empty?
+      @project = Project.where(id: params[:project_id]).first
+      if @project.nil?
+        render_404
+        return false
+      end
+    end
+  end
+
   def get_user
     render_403 unless User.current.logged?
 
     if params[:user_id] && params[:user_id] != User.current.id.to_s
-      if User.current.admin?
+      if User.current.allowed_to?(:view_others_stuff_to_do, @project, global: true)
         @user = User.find(params[:user_id])
       else
         render_403
@@ -98,11 +148,11 @@ def get_user
   end
 
   def filters_for_view
-    StuffToDoFilter.new
+    StuffToDoFilter.new(user: @user)
   end
 
   def get_filters
-    return default_filters unless params[:filter]
+    return default_filters if params[:filter].nil? or params[:filter].empty?
 
     id = params[:filter].split('-')[-1]
 
@@ -133,7 +183,8 @@ def default_filters
   def get_time_grid
     @date = parse_date_from_params
     @calendar = Redmine::Helpers::Calendar.new(@date, current_language, :week)
-    @issues = User.current.time_grid_issues.visible.all(:order => "#{Issue.table_name}.id ASC")
+    @spent_issues = User.current.time_grid_issues.visible.order("#{Issue.table_name}.id ASC").to_a
+    #Rails.logger.debug "get_time_grid issues = #{@spent_issues.inspect}"
     @time_entry = TimeEntry.new
   end
 
@@ -159,4 +210,24 @@ def parse_date_from_params
     date ||= Date.civil(params[:year].to_i, params[:month].to_i, params[:day].to_i) if params[:year] && params[:month] && params[:day]
     date ||= Date.today
   end
+
+  def default_filters
+    if StuffToDo.using_issues_as_items?
+      return @user
+    elsif StuffToDo.using_projects_as_items?
+      return Project.new
+    else
+    # Edge case
+    return { }
+    end
+  end
+
+  def load_stuff(filters=nil)
+    filters ||= default_filters
+
+    @doing_now = StuffToDo.doing_now(@user)
+    @recommended = StuffToDo.recommended(@user)
+    @available = StuffToDo.available(@user, @project, filters )
+  end
+
 end

app/controllers/stuff_to_do_reportee_controller.rb

@@ -0,0 +1,71 @@
+class StuffToDoReporteeController < ApplicationController
+  unloadable
+
+  before_action :get_user
+
+  def index
+    render :index, locals: { from_admin_menu: false }
+  end
+
+  def admin
+    render :index, layout: "admin", locals: { from_admin_menu: true }
+  end
+
+  def add
+    unless params[:reportee_ids].nil?
+      params[:reportee_ids].each do |reportee_id|
+        if !StuffToDoReportee.new(user: @user, reportee: User.find(reportee_id)).save
+          flash[:error] = l(:stuff_to_do_cannot_create_reportee_error)
+        end
+      end
+    end
+
+    unless params[:group_ids].nil?
+      params[:group_ids].each do |group_id|
+        if !StuffToDoReportee.new(user: @user, group: Group.find(group_id)).save
+          flash[:error] = l(:stuff_to_do_cannot_create_reportee_error)
+        end 
+      end
+    end
+
+    respond_to do |format|
+      format.html { redirect_to controller: 'stuff_to_do_reportee', action: 'index', user_id: @user.id }
+      format.js 
+    end
+  end
+
+  def delete
+    if [email protected]? && !params[:reportee_id].nil?
+      StuffToDoReportee.where(user_id: @user.id, reportee_id: params[:reportee_id]).each do |reportee|
+        reportee.destroy
+      end
+    end
+
+    if [email protected]? && !params[:group_id].nil?
+      StuffToDoReportee.where(user_id: @user.id, group_id: params[:group_id]).each do |group_reportee|
+        group_reportee.destroy
+      end
+    end
+
+    respond_to do |format|
+          format.html { redirect_to controller: 'stuff_to_do_reportee', action: 'index', user_id: @user.id }
+          format.js 
+    end
+  end
+
+
+  def get_user
+    return deny_access unless User.current.logged?
+
+    if params[:user_id]
+      if User.current.admin? || (User.current.id.to_s == params[:user_id])
+        @user = User.find(params[:user_id])
+      else
+        deny_access
+      end
+    else
+      @user = User.current  
+    end
+  end
+
+end