backlog 0.36.2 → 0.37.1

data/app/controllers/tasks_controller.rb

@@ -2,7 +2,7 @@ class TasksController < ApplicationController
   skip_before_filter :populate_layout, :except => [:edit, :grab, :list_started, :move_down, :move_to_bottom, :move_to_top, :move_up, :new, :specify]
   
   verify :method => :post, :except => [ :invite, :new, :show, :edit, :grab, :list_started, :move_to_next_period, :notes],
-  :redirect_to => { :controller => 'backlogs' }
+                           :redirect_to => { :controller => 'projects' }
   
   def list_started
     @tasks = Task.find_started
@@ -14,8 +14,8 @@ class TasksController < ApplicationController
     redirect_to params if request.post?
     params[:task].delete :file if params[:task]
     @task = Task.new params[:task]
-    @task.backlog_id ||= @task.period && @task.period.most_frequent_backlog
-    @backlogs = Backlog.find(:all, :order => 'name')
+    @task.project_id ||= @task.period && @task.period.most_frequent_project
+    @projects = Project.find(:all, :order => 'name')
     @periods = Period.find_active_or_future
     @customers = Customer.find(:all)
   end
@@ -39,11 +39,11 @@ class TasksController < ApplicationController
       if @task.period
         back_or_redirect_to :controller => 'periods', :action => 'show', :id => @task.period, :task => @task.id
       else
-        back_or_redirect_to :controller => 'backlogs', :action => :edit, :id => @task.backlog, :task => @task.id
+        back_or_redirect_to :controller => 'projects', :action => :edit, :id => @task.project, :task => @task.id
       end
     else
       populate_layout
-      @backlogs = Backlog.find(:all, :order => 'name')
+      @projects = Project.find(:all, :order => 'name')
       @periods = Period.find_active_or_future
       @customers = Customer.find(:all)
       render :action => 'new'
@@ -52,15 +52,15 @@ class TasksController < ApplicationController
   
   def edit
     @task ||= Task.find(params[:id])
-    @task.backlog_id = params[:task][:backlog_id] if params[:task] && params[:task][:backlog_id]
+    @task.project_id = params[:task][:project_id] if params[:task] && params[:task][:project_id]
     @task.period_id = params[:task][:period_id] if params[:task] && params[:task][:period_id]
     @periods = Period.find_active_or_future
-    @backlogs = Backlog.find(:all, :order => 'name')
+    @projects = Project.find(:all, :order => 'name')
     @customers = Customer.find(:all)
   end
   
   def update
-    redirect_to(:controller => 'backlogs', :action => :index) unless params[:id]
+    redirect_to(:controller => 'projects', :action => :index) unless params[:id]
     if params[:task] && params[:task][:description] == ''
       destroy
       return
@@ -83,7 +83,7 @@ class TasksController < ApplicationController
         if @task.period_id != nil
           @task.remove_from_list
           @task.period = nil
-          new_pos = @task.backlog.tasks.count(:conditions => 'period_id IS NULL AND parent_id IS NULL') + 1
+          new_pos = @task.project.tasks.count(:conditions => 'period_id IS NULL AND parent_id IS NULL') + 1
           params[:task].delete(:period_id)
           params[:task][:position] = new_pos
         end
@@ -119,7 +119,7 @@ class TasksController < ApplicationController
           if @task.period
             back_or_redirect_to :controller => 'periods', :action => :show, :id => @task.period, :task => @task.id
           else
-            back_or_redirect_to :controller => 'backlogs', :action => :show, :id => @task.backlog, :task => @task.id
+            back_or_redirect_to :controller => 'projects', :action => :show, :id => @task.project, :task => @task.id
           end
         end
       end
@@ -178,7 +178,7 @@ class TasksController < ApplicationController
             task.remove_from_list
             task.position = nil
             task.parent_id = target_task.parent_id
-            task.backlog_id = target_task.backlog_id
+            task.project_id = target_task.project_id
             task.period_id = target_task.period_id
           end
           task.insert_at target_task.position

data/app/controllers/user_controller.rb

@@ -32,9 +32,11 @@ class UserController < ApplicationController
           key = @user.generate_security_token
           url = url_for(:action => 'welcome')
           url += "?user[id]=#{@user.id}&key=#{key}"
-          UserNotify.deliver_signup(@user, params['user']['password'], url)
+          UserNotify.signup(@user, params['user']['password'], url).deliver
           flash[:notice] = 'Signup successful! Please check your registered email account to verify your account registration and continue with the login.'
           redirect_to :action => 'login'
+        else
+          logger.error @user.extra_columns_for_users.errors.full_messages
         end
       end
     rescue Exception => ex
@@ -197,7 +199,7 @@ class UserController < ApplicationController
   # Generate a template user for certain actions on get
   def generate_blank_form
     case request.method
-    when :get
+    when 'GET'
       @user = User.new
       if cookie = cookies['autologin']
         cookie_value = cookie[0]
@@ -226,7 +228,7 @@ class UserController < ApplicationController
     @sick_days_with_doctors_leave = absences.select {|a| a.reason == 'SICK_WITH_DOCTOR'}
     @sick_days_with_doctors_leave.map! {|a| a.on}
     case request.method
-    when :get
+    when 'GET'
       render
       return true
     end
@@ -242,7 +244,7 @@ class UserController < ApplicationController
   
   def populate_layout
     @sidebars = [
-    { :id => 1, :title => "Welcome to Backlog", :content => '<p>Welcome to Backlog, a project  support application targeted at collecting, planning, and completing tasks.</p><p>Backlog also offers history tracking and a graphical presentation of burn down charts.</p>' }
+    { :id => 1, :title => "Welcome to Project", :content => '<p>Welcome to Project, a project  support application targeted at collecting, planning, and completing tasks.</p><p>Project also offers history tracking and a graphical presentation of burn down charts.</p>' }
     ]
   end
   

data/app/controllers/welcome_controller.rb

@@ -5,8 +5,8 @@ class WelcomeController < ApplicationController
       redirect_to :controller => 'tasks', :action => :list_started
       return
     end
-    if Backlog.count == 0
-      redirect_to :controller => 'backlogs', :action => :new
+    if Project.count == 0
+      redirect_to :controller => 'projects', :action => :new
       return
     end
     active_periods = Period.find(:all).select {|period| period.active?(true)}
@@ -22,8 +22,8 @@ class WelcomeController < ApplicationController
       redirect_to :controller => 'periods', :action => :show, :id => most_urgent_period
       return
     end
-    most_urgent_backlog = Backlog.find(:first, :order => :id)
-    redirect_to :controller => 'backlogs', :action => :show, :id => most_urgent_backlog.id
+    most_urgent_project = Project.find(:first, :order => :id)
+    redirect_to :controller => 'projects', :action => :show, :id => most_urgent_project.id
   end
   
 end

data/app/controllers/work_locks_controller.rb

@@ -57,9 +57,9 @@ class WorkLocksController < ApplicationController
     @lock = WorkLock.find(:first, :conditions => ['user_id = ? AND start_on <= ? AND end_on >= ?', current_user.id, first_date, last_date])
     raise "Already locked" if @lock
     WorkLock.create! :user_id => current_user.id, :start_on => first_date, :end_on => last_date
-    backlog_subscribers = Work.works_for_week(@year, @week).flatten.compact.map {|w| w.backlog}.uniq.map {|wa| wa.work_lock_subscribers}.flatten.uniq
+    project_subscribers = Work.works_for_week(@year, @week).flatten.compact.map {|w| w.project}.uniq.map {|wa| wa.work_lock_subscribers}.flatten.uniq
     user_subscribers = current_user.work_lock_subscribers
-    notify_users = (backlog_subscribers + user_subscribers).uniq
+    notify_users = (project_subscribers + user_subscribers).uniq
     notify_users.each do |user|
       week_url = url_for :controller => 'works', :action => :weekly_work_sheet, :year => @year, :week => @week, :user_id => current_user.id
       spreadsheet_url = url_for :controller => 'works', :action => :timeliste, :year => @year, :week => @week, :user_id => current_user.id

data/app/controllers/works_controller.rb

@@ -14,14 +14,14 @@ class WorksController < ApplicationController
   :redirect_to => { :action => :list }
   
   def list
-    backlog_name = (params[:backlog_id] && Backlog.find(params[:backlog_id]).name) || l(:all_accounts)
+    project_name = (params[:project_id] && Project.find(params[:project_id]).name) || l(:all_accounts)
     @report_filter = WorksReportFilter.new(params[:report_filter])
-    @report_filter.title = "#{l :hours} for #{backlog_name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
+    @report_filter.title = "#{l :hours} for #{project_name} #{@report_filter.start_on && @report_filter.start_on.strftime('%Y-%m-%d - ')}#{@report_filter.end_on && @report_filter.end_on.strftime('%Y-%m-%d')}"
     @period = params[:id] && Period.find(params[:id])
-    @works = Work.paginate :conditions => ["started_on BETWEEN ? AND ? #{'AND backlog_id = ?' if @report_filter.backlog_id} #{@report_filter.invoice.nil? ? '' : 'AND invoice = ?'} #{@report_filter.user_id.nil? ? '' : 'AND user_id = ?'}", @report_filter.start_on, @report_filter.end_on, @report_filter.backlog_id, @report_filter.invoice, @report_filter.user_id].compact,
+    @works = Work.paginate :conditions => ["started_on BETWEEN ? AND ? #{'AND project_id = ?' if @report_filter.project_id} #{@report_filter.invoice.nil? ? '' : 'AND invoice = ?'} #{@report_filter.user_id.nil? ? '' : 'AND user_id = ?'}", @report_filter.start_on, @report_filter.end_on, @report_filter.project_id, @report_filter.invoice, @report_filter.user_id].compact,
     :page => params[:page], :per_page => @report_filter.page_size,
     :order => 'started_on, start_time, completed_at'
-    @backlogs = Backlog.find(:all, :order => :name)
+    @projects = Project.find(:all, :order => :name)
     @users = User.find(:all, :order => 'first_name, last_name')
     if params[:export] == 'excel'
       @works = @works.sort_by {|w| [w.user_id || 0, w.task_id || 999999, w.started_on]}
@@ -41,21 +41,21 @@ class WorksController < ApplicationController
       @work.user = user
     end
     @estimate ||= Estimate.new(params[:estimate])
-    @backlogs = Backlog.find(:all, :order => :name)
+    @projects = Project.find(:all, :order => :name)
     @tasks = Task.find_open
     @users = User.find(:all)
   end
   
   def create
     if params[:work]
-      backlog_name = params[:work].delete(:backlog_name)
+      project_name = params[:work].delete(:project_name)
       task_description = params[:work].delete(:task_description)
-      if backlog_name && backlog_name.size > 0 && task_description && task_description.size > 0
-        backlog = Backlog.find_by_name(backlog_name)
-        task = backlog.tasks_with_children.find{|t| t.description == task_description}
+      if project_name && project_name.size > 0 && task_description && task_description.size > 0
+        project = Project.find_by_name(project_name)
+        task = project.tasks_with_children.find{|t| t.description == task_description}
         params[:work][:task_id] = task.id if task
       end
-      convert_backlog_param
+      convert_project_param
       convert_customer_param
       unless convert_hours_param
         flash[:notice] = "Illegal time format"
@@ -94,14 +94,14 @@ class WorksController < ApplicationController
   end
   
   
-  def convert_backlog_param
-    account_name = params[:work].delete :backlog_name
+  def convert_project_param
+    account_name = params[:work].delete :project_name
     if account_name && account_name.size > 0
-      account = Backlog.find_by_name account_name
-      params[:work][:backlog_id] = account.id
+      account = Project.find_by_name account_name
+      params[:work][:project_id] = account.id
     end
   end
-  private :convert_backlog_param
+  private :convert_project_param
   
   def convert_customer_param
     customer_name = params[:work].delete :customer_name
@@ -119,7 +119,7 @@ class WorksController < ApplicationController
     @work ||= Work.find(params[:id])
     @work.attributes = params[:work]
     @estimate = Estimate.new(params[:estimate])
-    @backlogs = Backlog.find(:all)
+    @projects = Project.find(:all)
     @tasks = Task.find_open
     @tasks.unshift @work.task if @work.task
     @users = User.find(:all)
@@ -148,7 +148,7 @@ class WorksController < ApplicationController
     else
       @next_field = params[:field] || 'description'
     end
-    @backlogs = Backlog.find(:all, :order => :name)
+    @projects = Project.find(:all, :order => :name)
     @customers = Customer.find(:all, :order => :name)
     if flash[:work]
       @new_work = flash[:work]
@@ -219,7 +219,7 @@ class WorksController < ApplicationController
     @customers = Customer.find(:all, :order => :name)
     @started_works = Task.find_started
     @new_work = flash[:work] || Work.new(@works.last && @works.last.completed_at ? {:started_at => @works.last.completed_at} : nil)
-    @backlogs = Backlog.find(:all, :order => :name)
+    @projects = Project.find(:all, :order => :name)
     @absence = Absence.find(:first, :conditions => {:on => @date, :user_id => @user.id})
     @public_holiday = PublicHoliday.find(:first, :conditions => {:on => @date})
     render :layout => 'wide'
@@ -239,7 +239,7 @@ class WorksController < ApplicationController
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
     @user = params[:user_id] ? User.find(params[:user_id]) : current_user
-    @backlogs = Work.works_for_week_by_backlog(@year, @week, @user)
+    @projects = Work.works_for_week_by_project(@year, @week, @user)
     @first_date = Date.commercial(@year, @week, 1)
     @last_date = @first_date + 6
     @lock = WorkLock.find_by_week(@year, @week)
@@ -251,19 +251,19 @@ class WorksController < ApplicationController
   def timeliste
     @year = (params[:year] && params[:year].to_i) || Date.today.year
     @week = (params[:week] && params[:week].to_i) || Date.today.cweek
-    @work_totals_per_backlog = Work.work_totals_for_week(@year, @week)
+    @work_totals_per_project = Work.work_totals_for_week(@year, @week)
     headers["Content-Type"] = "application/vnd.ms-excel"
     headers["Content-Disposition"] = 'attachment; filename="export.xml"'
     render :layout => false
   end
   
-  def auto_complete_for_work_backlog_name
-    @accounts = Backlog.find(:all, 
+  def auto_complete_for_work_project_name
+    @accounts = Project.find(:all, 
                                  :conditions => [ 'LOWER(name) LIKE ?',
-    '%' + params[:work][:backlog_name].downcase + '%' ], 
+    '%' + params[:work][:project_name].downcase + '%' ], 
     :order => 'name ASC',
     :limit => 16)
-    render :partial => '/backlogs/name_list'
+    render :partial => '/projects/name_list'
   end
   
   def auto_complete_for_work_customer_name
@@ -275,13 +275,13 @@ class WorksController < ApplicationController
     render :partial => '/customers/name_list'
   end
   
-  def auto_complete_for_work_backlog_name
-    @backlogs = Backlog.find(:all, 
+  def auto_complete_for_work_project_name
+    @projects = Project.find(:all, 
                              :conditions => [ 'LOWER(name) LIKE ?',
-    '%' + params[:work][:backlog_name].downcase + '%' ], 
+    '%' + params[:work][:project_name].downcase + '%' ], 
     :order => 'name ASC',
     :limit => 16)
-    render :partial => '/backlogs/name_list'
+    render :partial => '/projects/name_list'
   end
   
   def auto_complete_for_work_task_id
@@ -307,14 +307,14 @@ class WorksController < ApplicationController
   def auto_complete_for_work_description
     max = 16
     works = Work.find(:all, :select => "description, count(*) as freq", 
-    :conditions => [ 'LOWER(description) LIKE ? AND backlog_id = ?', '%' + params[:description].downcase + '%', params[:backlog_id] ],
+    :conditions => [ 'LOWER(description) LIKE ? AND project_id = ?', '%' + params[:description].downcase + '%', params[:project_id] ],
     :group => "description",
     :order => 'freq DESC, description ASC',
     :limit => max)
     
     if works.size < max
       works += Work.find(:all, :select => "description, count(*) as freq", 
-      :conditions => [ 'LOWER(description) LIKE ? AND backlog_id <> ?', '%' + params[:description].downcase + '%', params[:backlog_id] ],
+      :conditions => [ 'LOWER(description) LIKE ? AND project_id <> ?', '%' + params[:description].downcase + '%', params[:project_id] ],
       :group => "description",
       :order => 'freq DESC, description ASC',
       :limit => max - works.size)
@@ -341,7 +341,7 @@ class WorksController < ApplicationController
   def update_new_row
     @field = params[:field]
     @next_field = params[:next_field]
-    convert_backlog_param
+    convert_project_param
     convert_customer_param
     raise "Unknown time format: #{params[:hours_time]}" unless convert_hours_param
     @work = Work.new(params[:work])

data/app/helpers/application_helper.rb

@@ -41,7 +41,7 @@ module ApplicationHelper
   def image_link_to_remote(image_source, title, link_options, image_options = nil, post = false)
     image_options ||= {:class => 'image-submit'}
     image_options.update :alt => title, :title => title
-    link_to_remote image_tag(image_source, image_options), link_options, post ? {:method => :post} : nil
+    link_to_remote image_tag(image_source, image_options), :url => link_options, :html => post ? {:remote => true, :method => :post} : {:remote => true}
   end
   
   def detour?
@@ -57,7 +57,7 @@ module ApplicationHelper
   end
   
   def l(value, *args)
-    return t(value, *args) if value.is_a?(Symbol)
+    t(value, *args) if value.is_a?(Symbol)
   end
   
   def t(time_as_float, *args)

data/app/helpers/application_helper.rb.rails2

@@ -0,0 +1,118 @@
+require 'url_for_fix'
+
+module ApplicationHelper
+  include UserSystem
+  include UrlForFix
+  
+  def image_button_to(image_source, title, options, html_options = {})
+    image_submit_tag image_source, {:class => 'image-submit', :alt => title, :title => title,
+        :id => "#{title}_#{options[:id]}", :name => title, 
+        :onclick => "form.action='#{url_for(options)}'"}.update(html_options)
+  end
+  
+  def detour_to(title, options, html_options = nil)
+    link_to title, with_detour(options), html_options
+  end
+  
+  def with_detour(options)
+    detour_options = {:detour => params.reject {|k, v| [:detour, :return_from_detour].include? k.to_sym}}.update(options)
+    if options[:layout]== false
+      if params[:action] !~ /_no_layout$/
+        detour_options[:detour].update({:action => params[:action] + '_no_layout'})
+      end
+    elsif params[:action] =~ /_no_layout$/
+      detour_options[:detour].update({:action => params[:action][0..-11]})
+    end
+    detour_options
+  end
+  
+  def image_detour_to(image_source, title, url_options, image_options = nil, post = false)
+    image_options ||= {:class => 'image-submit'}
+    image_options.update :alt => title, :title => title
+    detour_to image_tag(image_source, image_options), url_options, post ? {:method => :post} : nil 
+  end
+  
+  def image_link_to(image_source, title, url_options, image_options = nil, post = false)
+    image_options ||= {:class => 'image-submit'}
+    image_options.update :alt => title, :title => title
+    link_to image_tag(image_source, image_options), url_options, post ? {:method => :post} : nil
+  end
+  
+  def image_link_to_remote(image_source, title, link_options, image_options = nil, post = false)
+    image_options ||= {:class => 'image-submit'}
+    image_options.update :alt => title, :title => title
+    link_to_remote image_tag(image_source, image_options), link_options, post ? {:method => :post} : nil
+  end
+  
+  def detour?
+    not session[:detours].nil?
+  end
+  
+  def back_or_link_to(title, options = nil)
+    if session[:detours]
+      options = {:return_from_detour => true}.update(session[:detours].last)
+      logger.debug "linked return from detour: #{options}"
+    end
+    link_to(title, options) if options
+  end
+  
+  def l(value, *args)
+    return t(value, *args) if value.is_a?(Symbol)
+  end
+  
+  def t(time_as_float, *args)
+    return super if time_as_float.is_a?(Symbol)
+    return '' unless time_as_float
+    time_as_float = BigDecimal(time_as_float.to_s) unless time_as_float.is_a? BigDecimal
+    "#{time_as_float.to_i}:#{'%02d' % (time_as_float.frac * 60).round}" 
+  end
+  
+  def h(object)
+    if object.is_a? Time
+      object.strftime '%Y-%m-%d %H:%M:%S'
+    else
+      super object
+    end
+  end
+  
+  def resolution_image(resolution)
+    image_file = case resolution
+    when Task::COMPLETED
+    'checkmark.png'
+    when Task::POSTPONED
+    'arrow_right.png'
+    when Task::MOVED
+    'arrow_right.png'
+    when Task::ABORTED
+    'ernes_stop.png'
+    else
+      raise "Unknown resolution " + resolution
+    end
+    image_tag image_file, :title => l(resolution.downcase)
+  end
+  
+  def display_notice(page)
+    if flash[:notice]
+      page.replace_html :notice, flash[:notice]
+      page.visual_effect(:appear, :notice)
+      page.visual_effect(:highlight, :notice)
+      flash.discard
+    else
+      page.visual_effect(:fade, :notice)
+    end
+  end
+  
+  def record(page, script)
+    page.call("#{script};//")
+  end
+  
+  def insert(page, content, selector, position = :top)
+    escaped_content = content.gsub("\n", '').gsub("'", "\\\\'")
+    record(page, "new Insertion.#{position.to_s.capitalize}($$('#{selector}').first(), '#{escaped_content}')")
+  end
+  
+  def update_task(page)
+    page["task_#{@task.id}"].replace render(:partial => "/tasks/task", :locals => { :task => @task, :i => 1, :active => true, :highlight_task => false, :update => :spotlight, :hidden => false })
+  end
+  
+end