backlog 0.36.2 → 0.37.1

data/app/controllers/estimates_controller.rb

@@ -1,7 +1,7 @@
 class EstimatesController < ApplicationController
   helper :tasks
   
-  verify :method => :post, :redirect_to => ''
+  verify :method => :post, :redirect_to => '/'
   
   def create
     @success, flash[:notice] = do_create

data/app/controllers/groups_controller.rb

@@ -45,7 +45,9 @@ class GroupsController < ApplicationController
   end
 
   def destroy
-    Group.find(params[:id]).destroy
+    group = Group.find(params[:id])
+    group.users.delete_all
+    group.destroy
     redirect_to :action => 'list'
   end
 

data/app/controllers/periods_controller.rb

@@ -1,22 +1,22 @@
 class PeriodsController < ApplicationController
   skip_before_filter :populate_layout, :only => [:index, :show_no_layout, :destroy, :burn_down_chart_thumbnail, :burn_down_chart]
   skip_before_filter :authenticate_user, :only => [:burn_down_chart, :burn_down_chart_thumbnail, :burn_down_chart_large]
-  
+
   def index
-    active_periods = Period.find(:all).select {|period| period.active?(true)}
-    my_active_periods = active_periods.select {|period| period.party.includes?(current_user)}
+    active_periods    = Period.find(:all).select { |period| period.active?(true) }
+    my_active_periods = active_periods.select { |period| period.party.includes?(current_user) }
     unless my_active_periods.empty?
-      most_urgent_period = my_active_periods.sort_by {|p| p.required_speed}.last
+      most_urgent_period = my_active_periods.sort_by { |p| p.required_speed }.last
     else
-      most_urgent_period = active_periods.sort_by {|p| p.required_speed}.last
+      most_urgent_period = active_periods.sort_by { |p| p.required_speed }.last
     end
     flash.keep
     redirect_to :action => 'show', :id => most_urgent_period
   end
-  
+
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
-  verify :method => :post, :only => [ :destroy, :create, :update ], :redirect_to => { :action => :index }
-  
+  verify :method => :post, :only => [:destroy, :create, :update], :redirect_to => {:action => :index}
+
   def show
     if params[:task_id]
       @selected_task = Task.find(params[:task_id])
@@ -24,7 +24,7 @@ class PeriodsController < ApplicationController
     if @selected_task
       @period = @selected_task.period
       if @period.nil?
-        redirect_to :controller => 'backlogs', :action => :show, :id => @selected_task.backlog.id
+        redirect_to :controller => 'projects', :action => :show, :id => @selected_task.project.id
         return
       end
     elsif params[:id] && @period = Period.find_by_id(params[:id])
@@ -41,27 +41,27 @@ class PeriodsController < ApplicationController
     @show_only_grabbed_tasks = session['show_only_grabbed_tasks'] == 'true'
     load_tasks(@period)
   end
-  
+
   def show_no_layout
     show
     render :partial => 'show_active', :layout => false, :locals => {:i => 0}
   end
-  
+
   def new
     @period = Period.new
     if params[:period] && params[:period][:party_id]
       @period.party_id = params[:period][:party_id]
-      previous = @period.party.periods.last
+      previous         = @period.party.periods.last
       if previous
         @period.start_on = previous.end_on + 1
-        @period.end_on = previous.end_on + (1 + (previous.end_on - previous.start_on))
+        @period.end_on   = previous.end_on + (1 + (previous.end_on - previous.start_on))
       else
         @period.start_on = Date.today
       end
     end
     @parties = Party.find(:all)
   end
-  
+
   def create
     @period = Period.new(params[:period])
     if @period.save
@@ -72,11 +72,11 @@ class PeriodsController < ApplicationController
       render :action => 'new'
     end
   end
-  
+
   def edit
     @period = Period.find(params[:id])
   end
-  
+
   def update
     @period = Period.find(params[:id])
     if @period.update_attributes(params[:period])
@@ -86,36 +86,40 @@ class PeriodsController < ApplicationController
       render :action => 'edit'
     end
   end
-  
+
   def destroy
     Period.find(params[:id]).destroy
     flash[:notice] = 'Period was successfully deleted.'
     redirect_to :action => 'index'
   end
-  
+
   def burn_down_chart_thumbnail
     send_burn_down_chart Chart::THUMBNAIL
   end
-  
+
   def burn_down_chart
     send_burn_down_chart Chart::NORMAL
   end
-  
+
   def burn_down_chart_large
     send_burn_down_chart Chart::LARGE
   end
-  
+
   def list_work
     if @period = Period.find_by_id(params[:id])
-      @works = @period.tasks.map {|t| t.works}.flatten.sort_by {|w| [w.completed_at || Time.now.midnight, w.started_on, w.start_time]}
-      def @works.page_count; size / 25; end
+      @works = @period.tasks.map { |t| t.works }.flatten.sort_by { |w| [w.completed_at || Time.now.midnight, w.started_on, w.start_time] }
+
+      def @works.page_count;
+        size / 25;
+      end
+
       render :template => '/works/list'
     else
       flash[:notice] = "You need to provide a period ID"
       redirect_to ''
     end
   end
-  
+
   def make_link
     if params[:id].to_i > 0
       render :partial => 'link', :layout => false, :locals => {:period => Period.find(params[:id])}
@@ -123,7 +127,7 @@ class PeriodsController < ApplicationController
       render :text => ''
     end
   end
-  
+
   def move_task_to_period
     params[:id] = $1 if params[:id] =~ /^task_(\d*)/
     @task = Task.find(params[:id])
@@ -139,42 +143,49 @@ class PeriodsController < ApplicationController
           redirect_to :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
         end
       else
-        rjs_detour_to :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
+        if @task.period
+          rjs_detour_to :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
+        else
+          rjs_redirect_to :controller => :tasks, :action => :edit, :id => @task.id, :layout => false
+        end
       end
     else
       redirect_to :action => :show, :id => @task.period, :task_id => @task.id, :layout => false
     end
   end
-  
+
   def move_task_to_next_period
     @task = Task.find(params[:id])
-    next_period = @task.period.lower_item
-    next_period = next_period.lower_item while next_period && next_period.passed?
-    params[:period_id] = next_period && next_period.id
+    if @task.period
+      next_period = @task.period.lower_item
+      next_period = next_period.lower_item while next_period && next_period.passed?
+      params[:period_id] = next_period && next_period.id
+    end
     move_task_to_period
   end
-  
+
   def finish_task
     @task = Task.find(params[:id])
     @task.finish(Task::COMPLETED, true)
     load_tasks(@task.period)
   end
-  
+
   def abort_task
     @task = Task.find params[:id]
     @task.abort
     load_tasks(@task.period)
     render :action => :finish_task, :layout => false
   end
-  
+
   def reopen_task
     @task = Task.find(params[:id])
     @task.reopen
     @task.reload
     finished_count = Task.count(:conditions => ['period_id = ? AND finished_at IS NOT NULL', @task.period_id])
     @last_finished = finished_count == 0
+    load_tasks(@task.period)
   end
-  
+
   def update_task_estimate
     if params[:id]
       @task = Task.find_by_id(params[:id])
@@ -184,7 +195,7 @@ class PeriodsController < ApplicationController
           @task.estimate(params[:estimate][:todo])
           @period = @task.period
           @success, flash[:notice] = true, 'Estimate updated'
-          rescue ArgumentError => e
+        rescue ArgumentError => e
           @success, flash[:notice] = false, "Estimate was not numeric"
         end
         if @task.finished?
@@ -201,31 +212,31 @@ class PeriodsController < ApplicationController
       return false, 'Task id is missing.'
     end
   end
-  
+
   def order
-    if params.keys.find {|k| k =~ /active_tasks_(.*)/}
-    period_id = $1
-    ids = params["active_tasks_#{period_id}"]
-    tasks = ids.select {|id| not id.empty?}
-    tasks.each_with_index do |id,idx|
-      task = Task.find(id)
-      task.insert_at(idx + 1) 
-      task.save!
-    end
+    if params.keys.find { |k| k =~ /active_tasks_(.*)/ }
+      period_id = $1
+      ids       = params["active_tasks_#{period_id}"]
+      tasks     = ids.select { |id| not id.empty? }
+      tasks.each_with_index do |id, idx|
+        task = Task.find(id)
+        task.insert_at(idx + 1)
+        task.save!
+      end
     end
   end
 
   private
-  
+
   def send_burn_down_chart(size)
     period = Period.find(params[:id])
-    g = period.burn_down_graph(size)
+    g      = period.burn_down_graph(size)
     send_data(g, :disposition => 'inline', :type => 'image/png', :filename => "burn_down_chart.png")
   end
-  
+
   def load_tasks(period)
-    @tasks = period.open_tasks
+    @tasks           = period.open_tasks
     @completed_tasks = period.completed_tasks.reverse
   end
-  
+
 end

data/app/controllers/{backlogs_controller.rb → projects_controller.rb}

@@ -1,9 +1,8 @@
-class BacklogsController < ApplicationController
+class ProjectsController < ApplicationController
   skip_before_filter :populate_layout, :only => [:index, :burn_down_chart, :burn_down_chart_thumbnail, :destroy]
   
   # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
-  verify :method => :post, :only => [ :destroy, :create, :update ],
-  :redirect_to => { :action => :index }
+  verify :method => :post, :only => [ :destroy, :create, :update ], :redirect_to => { :action => :index }
   
   def index
     flash.keep
@@ -11,30 +10,30 @@ class BacklogsController < ApplicationController
       redirect_to :controller => 'tasks', :action => :list_started
       return
     end
-    if Backlog.count == 0
+    if Project.count == 0
       redirect_to :action => :new
       return
     end
-    most_urgent_backlog = Backlog.find(:first, :order => :id)
-    redirect_to :action => :show, :id => most_urgent_backlog.id
+    most_urgent_project = Project.find(:first, :order => :id)
+    redirect_to :action => :show, :id => most_urgent_project.id
   end
   
   def list
-    @backlogs = Backlog.find(:all, :order => 'name')
+    @projects = Project.find(:all, :order => 'name')
   end
   
   def show
     if params[:id]
-      @backlog = Backlog.find(params[:id])
+      @project = Project.find(params[:id])
     end
-    unless @backlog
-      @backlog = Backlog.find(:first)
-      unless @backlog
-        redirect_to :controller => 'backlogs', :action => :new
+    unless @project
+      @project = Project.find(:first)
+      unless @project
+        redirect_to :controller => 'projects', :action => :new
         return
       end
     end
-    load_tasks(@backlog)
+    load_tasks(@project)
   end
   
   def show_no_layout
@@ -43,21 +42,21 @@ class BacklogsController < ApplicationController
   end
   
   def new
-    @backlog = Backlog.new
+    @project = Project.new
   end
   
   def create
-    @backlog = Backlog.new(params[:backlog])
-    if @backlog.save
-      flash[:notice] = 'Backlog was successfully created.'
-      redirect_to :action => :show, :id => @backlog
+    @project = Project.new(params[:project])
+    if @project.save
+      flash[:notice] = 'Project was successfully created.'
+      redirect_to :action => :show, :id => @project
     else
       render :action => 'new'
     end
   end
   
   def edit
-    @backlog = Backlog.find(params[:id])
+    @project = Project.find(params[:id])
   end
   
   def edit_no_layout
@@ -66,18 +65,20 @@ class BacklogsController < ApplicationController
   end
   
   def update
-    @backlog = Backlog.find(params[:id])
-    if @backlog.update_attributes(params[:backlog])
-      flash[:notice] = 'Backlog was successfully updated.'
-      back_or_redirect_to :action => :show, :id => @backlog
+    @project = Project.find(params[:id])
+    if @project.update_attributes(params[:project])
+      flash[:notice] = 'Project was successfully updated.'
+      back_or_redirect_to :action => :show, :id => @project
     else
       render :action => 'edit'
     end
   end
   
   def destroy
-    Backlog.find(params[:id]).destroy
-    flash[:notice] = 'Backlog was successfully deleted.'
+    project = Project.find(params[:id])
+    project.work_lock_subscribers.delete_all
+    project.destroy
+    flash[:notice] = 'Project was successfully deleted.'
     redirect_to :action => 'index'
   end
   
@@ -94,7 +95,7 @@ class BacklogsController < ApplicationController
           @success, flash[:notice] = false, "Estimate was not numeric"
         end
         if @task.finished?
-          load_tasks(@task.backlog)
+          load_tasks(@task.project)
           render :action => 'finish_task', :layout => false
         else
           render :template => '/tasks/update_estimate', :layout => false
@@ -111,13 +112,13 @@ class BacklogsController < ApplicationController
   def finish_task
     @task = Task.find(params[:id])
     @task.finish(Task::COMPLETED, true)
-    load_tasks(@task.backlog)
+    load_tasks(@task.project)
   end
   
   def abort_task
     @task = Task.find params[:id]
     @task.abort
-    load_tasks(@task.backlog)
+    load_tasks(@task.project)
     render :action => :finish_task, :layout => false
   end
   
@@ -129,7 +130,7 @@ class BacklogsController < ApplicationController
       if period && period.active_or_future?
         next_task = @task.higher_item ? @task.higher_item : @task.lower_item ? @task.lower_item : @task
         @task.move_to_period period
-        load_tasks(@task.backlog)
+        load_tasks(@task.project)
         render :action => :move_task_to_period, :layout => false
       else
         rjs_detour_to :controller => 'periods', :action => :new, :period => {:party_id => @task.period.party_id}, :layout => false
@@ -153,7 +154,7 @@ class BacklogsController < ApplicationController
   
   def reopen_task
     @task = Task.find(params[:id]).reopen
-    load_tasks(@task.backlog)
+    load_tasks(@task.project)
   end
   
   def order
@@ -174,12 +175,11 @@ class BacklogsController < ApplicationController
   
   private
   
-  def load_tasks(backlog)
-    unplanned_tasks = backlog.tasks.select {|t| t.period.nil? && t.finished_at.nil?}.sort_by {|t| t.position}
-    planned_tasks = backlog.tasks.select {|t| t.period && t.finished_at.nil?}.sort_by {|t| [t.period.end_on, t.position]}
+  def load_tasks(project)
+    unplanned_tasks = project.tasks.select {|t| t.period.nil? && t.finished_at.nil?}.sort_by {|t| t.position}
+    planned_tasks = project.tasks.select {|t| t.period && t.finished_at.nil?}.sort_by {|t| [t.period.end_on, t.position.to_i]}
     @tasks = planned_tasks + unplanned_tasks
-    @completed_tasks = backlog.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
-    
+    @completed_tasks = project.tasks.select {|t| t.finished_at}.sort {|t1, t2| t2.finished_at <=> t1.finished_at}
   end
   
 end

data/app/controllers/search_controller.rb

@@ -3,11 +3,11 @@ class SearchController < ApplicationController
   def results
     if params[:q]
       @search = params[:q]
-      @backlogs = Backlog.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
+      @projects = Project.find(:all, :conditions => ["lower(name) LIKE ?", "%#{@search.downcase}%"])
       @tasks = Task.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
       @works = Work.find(:all, :conditions => ["lower(description) LIKE ? OR lower(notes) LIKE ?", "%#{@search.downcase}%", "%#{@search.downcase}%"])
     else
-      @backlogs = []
+      @projects = []
       @tasks = []
       @works = []
     end