backlog 0.35.5 → 0.36.2

data/app/models/period.rb

@@ -1,5 +1,4 @@
 class Period < ActiveRecord::Base
-  include Localization
   extend UserSystem
   include UserSystem
   
@@ -158,10 +157,6 @@ class Period < ActiveRecord::Base
     not backlogs.find {|backlog| backlog.track_todo?}.nil?
   end
   
-  def track_work?
-    not backlogs.find {|backlog| backlog.work_account}.nil?
-  end
-  
   def track_times?
     not backlogs.find {|backlog| backlog.track_times?}.nil?
   end

data/app/models/sidebar.rb

@@ -2,6 +2,7 @@ require 'action_view/helpers/url_helper'
 
 class Sidebar
   include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
   include ERB::Util
   
   def initialize(controller)

data/app/models/task.rb

@@ -13,7 +13,6 @@ class Task < ActiveRecord::Base
   belongs_to :period
   belongs_to :ancestor_task, :class_name => 'Task', :foreign_key => 'previous_task_id' 
   belongs_to :customer
-  belongs_to :work_account
   has_many :descendant_tasks, :class_name => 'Task', :foreign_key => 'previous_task_id', :dependent => :destroy
   has_many :estimates, :order => 'created_at', :dependent => :destroy
   has_many :works, :order => 'completed_at', :dependent => :destroy
@@ -284,11 +283,11 @@ class Task < ActiveRecord::Base
   end
   
   def track_done?
-    not root_task.backlog.work_account.nil?
+    backlog.track_done?
   end
-  
+
   def track_times?
-    work_account && work_account.track_times?
+    backlog.try :track_times?
   end
   
   def track_todo?
@@ -321,11 +320,6 @@ class Task < ActiveRecord::Base
     old_backlog || root_task.old_backlog
   end
   
-  alias_method :old_work_account, :work_account
-  def work_account
-    self.old_work_account || (parent ? parent.work_account : backlog.work_account)
-  end
-  
   def depth
     root_task = self 
     depth = 0
@@ -386,7 +380,7 @@ class Task < ActiveRecord::Base
     end
     
     new_work.user = current_user
-    new_work.work_account_id = work_account.id
+    new_work.backlog_id = backlog.id
     new_work.save!
     works << new_work
   end

data/app/models/user.rb

@@ -39,7 +39,7 @@ class User < Party
   validates_length_of :role, :allow_nil => true, :maximum => 40
 
   validates_length_of :security_token, :allow_nil => true, :maximum => 40
-  validates_inclusion_of :deleted, :in => [true, false], :allow_nil => true, :message => ActiveRecord::Errors.default_error_messages[:blank]
+  validates_inclusion_of :deleted, :in => [true, false], :allow_nil => true, :message => I18n.translate('activerecord.errors.messages')[:blank]
 
   def initialize(attributes = nil)
     super
@@ -61,12 +61,11 @@ class User < Party
     # not the regular authenticate call)
     logger.info "Attempting authorization of #{id} with #{token}"
     u = find(:first, :conditions => ["id = ? AND security_token = ?", id, token])
-    if u
-      logger.info "Authenticated by token: #{u.inspect}"
-    else
-      logger.info "Not authenticated" if u.nil?
+    if u.nil? || u.token_expired?
+      logger.info "Not authenticated"
+      return nil
     end
-    return nil if (u.nil? or u.token_expired?)
+    logger.info "Authenticated by token: #{u.inspect}"
     u.update_attribute :verified, true
     return u
   end

data/app/models/user_notify.rb

@@ -1,5 +1,4 @@
 class UserNotify < ActionMailer::Base
-  include Localization
   
   def signup(user, password, url=nil)
     setup_email(user)

data/app/models/work.rb

@@ -4,11 +4,11 @@ class Work < ActiveRecord::Base
   
   belongs_to :task
   belongs_to :user
-  belongs_to :work_account
+  belongs_to :backlog
   belongs_to :customer
   
   validates_associated :task
-  validates_presence_of :work_account
+  validates_presence_of :backlog
   validates_presence_of :started_on
   validates_presence_of :start_time, :if => :track_times?
   
@@ -17,13 +17,8 @@ class Work < ActiveRecord::Base
     self.invoice = true if self.invoice.nil?
   end
   
-  alias_method :old_work_account, :work_account
-  def work_account
-    self.old_work_account || (task && task.work_account)
-  end
-  
   def track_times?
-    work_account && work_account.track_times?
+    backlog && backlog.track_times?
   end
   
   # Return an array with an array of works per day:
@@ -49,23 +44,23 @@ class Work < ActiveRecord::Base
   
   # Return a hash with work accounts as keys an array of work hours totals per day as values:
   # {
-  #   <#WorkAccount#1> => [  8,   7,   9,  12,   4, nil, nil],
-  #   <#WorkAccount#2> => [nil,   1, nil, nil,   4, nil, nil],
-  #   <#WorkAccount#3> => [nil, nil, nil, nil, nil,   4,   3],
+  #   <#Backlog#1> => [  8,   7,   9,  12,   4, nil, nil],
+  #   <#Backlog#2> => [nil,   1, nil, nil,   4, nil, nil],
+  #   <#Backlog#3> => [nil, nil, nil, nil, nil,   4,   3],
   # ]
-  def self.works_for_week_by_work_account(year, week_no, user = current_user)
+  def self.works_for_week_by_backlog(year, week_no, user = current_user)
     first_date = Date.commercial(year, week_no, 1)
     last_date = first_date + 6
     works = find(:all, :conditions => "user_id #{user ? " = #{user.id}" : "IS NULL"} AND started_on BETWEEN '#{first_date}' AND '#{last_date}'", :order => 'completed_at, started_on, start_time')
     result = {}
     works.each do |work|
       day_of_week = work.started_on.cwday - 1
-      result[work.work_account] ||= []
-      result[work.work_account][day_of_week] ||= BigDecimal('0')
-      result[work.work_account][day_of_week] += work.hours
+      result[work.backlog] ||= []
+      result[work.backlog][day_of_week] ||= BigDecimal('0')
+      result[work.backlog][day_of_week] += work.hours
     end
-    result.values.each {|work_account_totals| work_account_totals[6] ||= nil}
-    result.values.each {|work_account_totals| (0..6).each {|i| work_account_totals[i] = nil if work_account_totals[i] == 0}}
+    result.values.each {|backlog_totals| backlog_totals[6] ||= nil}
+    result.values.each {|backlog_totals| (0..6).each {|i| backlog_totals[i] = nil if backlog_totals[i] == 0}}
     result
   end
   
@@ -78,24 +73,24 @@ class Work < ActiveRecord::Base
     first = Date.commercial(year, week_no, 1)
     last = first + 6
     works = find(:all, :conditions => "completed_at IS NOT NULL AND started_on BETWEEN '#{first}' AND '#{last}'", :order => 'started_on, start_time, completed_at')
-    totals_per_work_account = {}
-    works.map{|w| w.work_account}.uniq.each do |work_account|
-      totals_per_work_account[work_account.id] = [[], []]
+    totals_per_backlog = {}
+    works.map{|w| w.backlog}.uniq.each do |backlog|
+      totals_per_backlog[backlog.id] = [[], []]
        (0..6).each do |day|
-        works_for_day = works.select {|work| (work.work_account == work_account) && (work.started_on == (first + day)) && ((user.nil? && work.user_id.nil?) || (user && work.user_id == user.id)) }
+        works_for_day = works.select {|work| (work.backlog == backlog) && (work.started_on == (first + day)) && ((user.nil? && work.user_id.nil?) || (user && work.user_id == user.id)) }
         invoice_works_for_day = works_for_day.select {|work| work.invoice? }
         internal_works_for_day = works_for_day.select {|work| !work.invoice? }
         
         invoice_day_total = invoice_works_for_day.reduce(BigDecimal('0')){|total, work| total += work.hours}
         internal_day_total = internal_works_for_day.reduce(BigDecimal('0')){|total, work| total += work.hours}
-        totals_per_work_account[work_account.id][0] << invoice_day_total
-        totals_per_work_account[work_account.id][1] << internal_day_total
+        totals_per_backlog[backlog.id][0] << invoice_day_total
+        totals_per_backlog[backlog.id][1] << internal_day_total
       end
     end
-    totals_per_work_account.reject! do |work_account_id, day_totals|
+    totals_per_backlog.reject! do |backlog_id, day_totals|
       !day_totals[0].find{|day_total| day_total > 0} && !day_totals[1].find{|day_total| day_total > 0}
     end
-    totals_per_work_account
+    totals_per_backlog
   end
   
   def self.find_work_for_day(date, user = current_user)

data/app/models/works_report_filter.rb

@@ -1,18 +1,18 @@
 class WorksReportFilter < ReportFilter
-  attr_reader :work_account_id
+  attr_reader :backlog_id
   attr_reader :invoice
   attr_reader :user_id
   
   def initialize(attributes)
-    @work_account_id = nil
+    @backlog_id = nil
     @invoice = nil
     @user_id = nil
 
     if attributes
       attributes = attributes.clone
       
-      work_account_id_param = attributes.delete(:work_account_id)
-      @work_account_id = work_account_id_param.to_i if work_account_id_param && work_account_id_param.size > 0
+      backlog_id_param = attributes.delete(:backlog_id)
+      @backlog_id = backlog_id_param.to_i if backlog_id_param && backlog_id_param.size > 0
       
       invoice_param = attributes.delete(:invoice)
       @invoice = invoice_param == 'true' if invoice_param && invoice_param.size > 0

data/app/views/backlogs/_buttons.rhtml

@@ -1,4 +1,4 @@
     	<%=image_link_to 'arrow_up.png', l(:backlogs), :action => :list %>
         <%=image_detour_to('clipboard.png', l(:edit), :controller => 'backlogs', :action => :edit, :id => @backlog) unless controller.action_name == 'edit' %>
-        <%=image_detour_to('hammer.png', l(:work), :controller => 'backlogs', :action => :works, :id => @backlog) %>
+        <%=image_detour_to('hammer.png', l(:work), :controller => 'works', :action => :list, :report_filter => {:backlog_id => @backlog.id}) %>
         <%=detour_to(image_tag(url_for("add.png"), :alt => l(:add_task), :title => l(:add_task), :class => 'image-submit'), :controller => 'tasks', :action => 'new', :task => {:backlog_id => @backlog.id} ) %>

data/app/views/backlogs/_form.rhtml

@@ -6,6 +6,11 @@
 
 <h3>Options</h3>
 
+<p>
+<%= check_box 'backlog', 'track_times'  %>
+<label for="backlog_track_times"><%=l :track_times%></label>
+</p>
+
 <p>
 <%= check_box 'backlog', 'track_todo'  %>
 <label for="backlog_track_todo"><%=l :track_todo%></label>
@@ -31,15 +36,6 @@
 <label for="backlog_enable_users"><%=l :enable_users%></label>
 </p>
 
-<p>
-<label for="backlog_work_account"><%=l :work_account%></label><br/>
-<%=select 'backlog', 'work_account_id', [['', '']] + @work_accounts.map {|wa| [wa.name, wa.id]}.sort %>
-<% if @backlog.work_account %>
-  <%=image_detour_to('work_account.png', "#{l(:work_account)} #{@backlog.work_account.name}", {:controller => 'work_accounts', :action => :edit, :id => @backlog.work_account}, {:class => 'image-submit', :style => 'vertical-align: bottom'}) %>
-<% end %>
-<%=detour_to l(:new_work_account), :controller => 'work_accounts', :action => :new %>
-</p>
-
 <!--[eoform:task]-->
 
 

data/app/views/layouts/_left_top.rhtml

@@ -6,7 +6,6 @@
       
       <% if user? %>
       | <%= link_to l(:backlogs), :controller => 'backlogs', :action => :list %>
-      | <%= link_to l(:work_accounts), :controller => 'work_accounts', :action => :list %>
       | <%= link_to l(:log_out), :controller => 'user', :action => :logout %>
       <% else %>
       | <%= detour_to l(:log_in), :controller => 'user', :action => :login %>

data/app/views/periods/_form.rhtml

@@ -7,7 +7,7 @@
   <%= select 'period', 'party_id', (@period.party ? [] : [['', '']]) + @parties.map{|party| [party.name, party.id]}, {}, :onchange => "form.action = '#{url_for :action => :new}'; form.submit();" %>
 <% else %>
   <label for="period_party_id"><%=l @period.party.class.name.downcase.to_s%></label>:
-  <%= hidden_field 'period', 'party_id' %><%=detour_to h(@period.party.name), :controller => @period.party.type.name.downcase.pluralize, :action => :edit, :id => @period.party%>
+  <%= hidden_field 'period', 'party_id' %><%=detour_to h(@period.party.name), :controller => @period.party.type.to_s.downcase.pluralize, :action => :edit, :id => @period.party%>
 <% end %>
 <% if @period.party %>
   <%=image_detour_to(@period.party.icon, "#{l(@period.party.to_sym)} #{@period.party.name}", :controller => @period.party.controller, :action => :edit, :id => @period.party) %>

data/app/views/search/results.rhtml

@@ -1,4 +1,4 @@
-<% @page_title = l(:search_results_for, @search) %>
+<% @page_title = l(:search_results_for, :query => @search) %>
 
 <div id="lfeature">
   <div class="btitle">
@@ -11,17 +11,6 @@
 </ul>
 </div>
 
-<div id="rfeature">
-  <div class="btitle">
-    <h4><%=l(:work_accounts) %></h4>
-  </div>
-<ul>
-<% @work_accounts.each do |work_account| %>
-<li><%=link_to work_account.name, :controller => 'work_accounts', :action => :edit, :id => work_account%></li>
-<% end %>
-</ul>
-</div>
-
 <div id="lfeature">
   <div class="btitle">
     <h4><%=l(:tasks) %></h4>

data/app/views/tasks/_task.rhtml

@@ -1,26 +1,25 @@
-<% @task = task %>
-  <li id="task_<%=@task.id%>"<%=' class="tasks" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'"' if active && (@task.period.nil? || @task.period.active_or_future?) && (not @task.work_started?) %><%=' class="highlight"' if highlight_task %><%=' style="display: none"' if hidden %>>
+  <li id="task_<%=task.id%>"<%=' class="tasks" onmouseover="this.style.border=\'1px solid black\'" onmouseout="this.style.border=\'1px solid transparent\'"' if active && (task.period.nil? || task.period.active_or_future?) && (not task.work_started?) %><%=' class="highlight"' if highlight_task %><%=' style="display: none"' if hidden %>>
     <div style="float: left" style="border: 0px">
-    <% if @task.enable_subtasks? && active && (@task.period.nil? || @task.period.active_or_future?) %>
-      <% form_tag({:controller => 'tasks', :action => :specify, :id => @task}) do %>
-        <%=image_button_to('add.png', l(:specify), {:controller => 'tasks', :action => :specify, :id => @task.id}, 
-        		:style => "margin-left: #{@task.depth * 2}em") %>
+    <% if task.enable_subtasks? && active && (task.period.nil? || task.period.active_or_future?) %>
+      <% form_tag({:controller => 'tasks', :action => :specify, :id => task}) do %>
+        <%=image_button_to('add.png', l(:specify), {:controller => 'tasks', :action => :specify, :id => task.id}, 
+        		:style => "margin-left: #{task.depth * 2}em") %>
       <% end %>
     <% else %>
 		<%=image_tag 'blank.png', :class => 'image-submit', :style => "margin-left: 0em; padding: 0px" %>
     <% end %>
     </div>
     <div style="float: left" style="border: 3px solid red">
-      <%=resolution_image(@task.resolution) if @task.finished_at %>
+      <%=resolution_image(task.resolution) if task.finished_at %>
     </div>
-	<div id="task_<%=@task.id%>_id" class="task_id">
-   		<%=detour_to "##{@task.id}", :controller => 'tasks', :action => :edit, :id => @task.id, :style => 'border: 0px; margin: 0px; padding: 0px' if @task.position || @task.depth == 0 %>
+	<div id="task_<%=task.id%>_id" class="task_id">
+   		<%=detour_to "##{task.id}", :controller => 'tasks', :action => :edit, :id => task.id, :style => 'border: 0px; margin: 0px; padding: 0px' if task.position || task.depth == 0 %>
 	</div>
-	<div id="task_<%=@task.id%>_description" class="task_description">
-   		<b><%=h(@task.description)%></b>
+	<div id="task_<%=task.id%>_description" class="task_description">
+   		<b><%=h(task.description)%></b>
 		<% if show_backlog %>
 			<br/>
-			<%=l :backlog%>: <%=detour_to(h(@task.backlog.name), :controller => 'backlogs', :action => :show, :id => @task.backlog) %>
+			<%=l :backlog%>: <%=detour_to(h(task.backlog.name), :controller => 'backlogs', :action => :show, :id => task.backlog) %>
 		<% end %>
 	</div>
 
@@ -28,15 +27,15 @@
 
     <div style="float: right" style="border: 1px solid black">
     <div class="task_start">
-      <% if active && @task.loggable? -%>
-          <% if @task.work_started? -%>
-            <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => @task.started_work}) do |f| %>
+      <% if active && task.loggable? -%>
+          <% if task.work_started? -%>
+            <% remote_form_for(:work, :url => {:controller => 'works', :action => 'update_time', :id => task.started_work}) do |f| %>
               <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-              <%=f.text_field 'start_time', :id => "work_#{@task.started_work.id}_start_time", :tabindex => i+1, :value => (@task.started_work.start_time ? @task.started_work.start_time.strftime('%H:%M') : ''),
+              <%=f.text_field 'start_time', :id => "work_#{task.started_work.id}_start_time", :tabindex => i+1, :value => (task.started_work.start_time ? task.started_work.start_time.strftime('%H:%M') : ''),
                   :class => :task_time, :maxlength => 5 %>
             <% end %>
-          <% elsif @task.track_times? && (@task.period_id.nil? || @task.period.active?) %>
-            <%=image_link_to_remote 'hammer.png', l(:start_work), with_detour({:controller => 'tasks', :action => :start_work, :id => @task.id}), nil, true %>
+          <% elsif task.track_times? && (task.period_id.nil? || task.period.active?) %>
+            <%=image_link_to_remote 'hammer.png', l(:start_work), {:url => with_detour({:controller => 'tasks', :action => :start_work, :id => task.id})}, nil, true %>
 	      <% else -%>
     		&nbsp;
           <% end -%>
@@ -45,65 +44,65 @@
       <% end -%>
     </div>
     <div class="task_end_work">
-      <% if active && @task.loggable? && @task.work_started? -%>
-        <% form_tag({:controller => 'works', :action => 'update', :id => @task.started_work}) do %>
-          <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => @task.id}, nil, true) %>
+      <% if active && task.loggable? && task.work_started? -%>
+        <% form_tag({:controller => 'works', :action => 'update', :id => task.started_work}) do %>
+          <%= image_detour_to('ernes_stop.png', l(:end_work), {:controller => 'tasks', :action => :end_work, :id => task.id}, nil, true) %>
         <% end -%>
 	  <% else %>
         &nbsp;
       <% end -%>
     </div>
-    <div class="task_done" align="<%=active && @task.loggable? && @task.track_done? ? 'left' : 'right'%>">
-	<% if @task.track_done? || @task.total_done != 0 %>
-      <% if @task.loggable? || @task.finished_at -%>
-          <% unless !@task.track_done? || @task.track_times? || @task.work_started? || @task.finished_at -%>
-            <% form_tag({:controller => 'works', :action => (@task.work_started? ? :edit : :create), :id => @task.started_work}) do %>
-              <%=hidden_field('work', 'task_id', :value => @task.id)%>
+    <div class="task_done" align="<%=active && task.loggable? && task.track_done? ? 'left' : 'right'%>">
+	<% if task.track_done? || task.total_done != 0 %>
+      <% if task.loggable? || task.finished_at -%>
+          <% unless !task.track_done? || task.track_times? || task.work_started? || task.finished_at -%>
+            <% form_tag({:controller => 'works', :action => (task.work_started? ? :edit : :create), :id => task.started_work}) do %>
+              <%=hidden_field('work', 'task_id', :value => task.id)%>
               <%=submit_tag('checkmark', :value => l(:save), :style => 'display: none')%>
-              <%=text_field 'work', 'hours', :tabindex => i+1, :id => "#{@task.id}_done", 
+              <%=text_field 'work', 'hours', :tabindex => i+1, :id => "#{task.id}_done", 
                   :class => :task_hours, :maxlength => 4,
                   :ondblclick => "form.elements[1].style.display = 'inline';this.style.display = 'none'" -%>
             <% end -%>
           <% end -%>
-          <%=t @task.total_done if @task.total_done != 0%>
+          <%=t task.total_done if task.total_done != 0%>
       <% end -%>
     <% end -%>
     </div>
     <div class="task_todo">
-      <% if active && @task.loggable? -%>
-          <% if @task.track_todo? -%>
-            <% if @task.period.nil? || @task.period.active_or_future? -%>
-              <% remote_form_for(:estimate, :url => {:action => :update_task_estimate, :id => @task}) do |f| -%>
-                <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{@task.id}_todo", :value => @task.todo, :class => :task_hours, :maxlength => 4 %>
+      <% if active && task.loggable? -%>
+          <% if task.track_todo? -%>
+            <% if task.period.nil? || task.period.active_or_future? -%>
+              <% remote_form_for(:estimate, :url => {:action => :update_task_estimate, :id => task}) do |f| -%>
+                <%=f.text_field :todo, :tabindex => i+2, :id => "task_#{task.id}_todo", :value => task.todo, :class => :task_hours, :maxlength => 4 %>
               <% end -%>
             <% else -%>
-              <%=@task.todo %>
+              <%=task.todo %>
             <% end -%>
 		  <% else %>
-          	<% if !@task.work_started? && (@task.period.nil? || @task.period.active?) %>
-            	<%=image_link_to_remote('checkmark.png', l(:complete), {:action => :finish_task, :id => @task}, nil, true)%>
+          	<% if !task.work_started? && (task.period.nil? || task.period.active?) %>
+            	<%=image_link_to_remote('checkmark.png', l(:complete), {:url => {:action => :finish_task, :id => task}}, nil, true)%>
           	<% end -%>
           <% end -%>
       <% end -%>
     </div>
     <div class="task_buttons">
-        <% if @task.active? -%>
-          <% if @task.loggable? -%>
-            <% unless @task.work_started? -%>
-			  <% if @task.backlog.enable_users? %>
-			  	<% if @task.users.include?(current_user) %>
-	              <%=image_link_to_remote('grab.png', l(:release_task), with_detour({:controller => 'tasks', :action => :release, :id => @task}), nil, true)%>
+        <% if task.active? -%>
+          <% if task.loggable? -%>
+            <% unless task.work_started? -%>
+			  <% if task.backlog.enable_users? %>
+			  	<% if task.users.include?(current_user) %>
+	              <%=image_link_to_remote('grab.png', l(:release_task), {:url => with_detour({:controller => 'tasks', :action => :release, :id => task})}, nil, true)%>
 			  	<% else %>
-	              <%=image_link_to_remote('grab_gray.png', "#{l:grab_task} #{" (#{l :not_grabbed})" if @task.users.empty?}", with_detour({:controller => 'tasks', :action => :grab, :id => @task}), nil, true)%>
+	              <%=image_link_to_remote('grab_gray.png', "#{l:grab_task} #{" (#{l :not_grabbed})" if task.users.empty?}", {:url => with_detour({:controller => 'tasks', :action => :grab, :id => task})}, nil, true)%>
 			  	<% end %>
 			  <% end %>
-              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:action => :move_task_to_next_period, :id => @task}, nil, true) if @task.backlog.enable_periods? || @task.period_id%>
-              <%=image_link_to_remote('ernes_stop.png', l(:abort), {:action => :abort_task, :id => @task}, nil, true)%>
+              <%=image_link_to_remote('arrow_right.png', l(:move_to_next_period), {:url => {:action => :move_task_to_next_period, :id => task}}, nil, true) if task.backlog.enable_periods? || task.period_id%>
+              <%=image_link_to_remote('ernes_stop.png', l(:abort), {:url => {:action => :abort_task, :id => task}}, nil, true)%>
             <% end -%>
           <% end -%>
-        <% elsif (@task.period.nil? || (not @task.period.passed?)) && @task.leaf? -%>
-      		<% form_tag({:controller => 'tasks', :action => 'update', :id => @task}) do -%>
-          		<%=image_link_to_remote('eraser.png', l(:reopen), {:action => :reopen_task, :id => @task}, nil, true) %>
+        <% elsif (task.period.nil? || (not task.period.passed?)) && task.leaf? -%>
+      		<% form_tag({:controller => 'tasks', :action => 'update', :id => task}) do -%>
+          		<%=image_link_to_remote('eraser.png', l(:reopen), {:url => {:action => :reopen_task, :id => task}}, nil, true) %>
       		<% end -%>
         <% end -%>
     </div>
@@ -112,6 +111,6 @@
   </li>
 
   <% for subtask in task.children %>
-    <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active, :highlight_task => subtask == @selected_task, :update => update } if (active && subtask.active?) || (!active && subtask.completed?) %>
+    <%=render :partial => '/tasks/task', :locals => { :task => subtask, :i => i, :active => active, :hidden => false, :show_backlog => false, :highlight_task => subtask == @selected_task, :update => update } if (active && subtask.active?) || (!active && subtask.completed?) %>
     <% i += 1 %>
   <% end %>