@@ -19,5 +19,7 @@ vendor/gems/*/*/*/Makefile vendor/gems/*/*/*/*.o vendor/gems/*/*/*/*.so vendor/gems/*/*/*.so +vendor/gems/*/*/*.bundle +vendor/gems/*/*/*/*.bundle *.DS_Store \ No newline at end of file .gitignore @@ -1,6 +1,7 @@ class TeamsController < ApplicationController before_filter :login_required, :except => [:show, :rss, :icalendar] + before_filter :find_current_date, :only => [:teamworkload] def index redirect_to :controller => 'tasks', :action => 'workload' @@ -410,10 +411,7 @@ http://www.mychores.co.uk" flash[:notice] = "You cannot view this team's workload because you are not a team member." redirect_to :controller => 'teams', :action => 'show', :id => @team.id else - - @mytimezone = TimeZone.new(@person.timezone_name) - @datetoday = Date.parse(@mytimezone.today().to_s) - + if session[:preference].nil? session[:preference] = Preference.find(:first, :conditions => ["person_id = ?", session[:person].id ]) end app/controllers/teams_controller.rb @@ -61,7 +61,7 @@ <% end %> <% if @workload_columns.include?("Team") %> - <th><%= "Team".t %></th> + <th>Team</th> <% end %> <% if @workload_columns.include?("Listonly") %> app/views/lists/show.rhtml @@ -139,6 +139,6 @@ <br /> <% form_tag(:action => 'quickchangepreferences') do %><div> - <p>Show: <%= select('preference', 'workload_display', workload_display_select_options(@person)) %> Order by: <%= select('preference', 'workload_order_by', [["Due date", "Due date"], ["Importance", "Importance"]]) %> Per page: <%= select('preference', 'workload_page_size', ["10", "15", "20", "25", "30", "40"]) %> <%= submit_tag("Go!") %></p> + <p>Show: <%= select('preference', 'workload_display', workload_display_select_options(@person)) %> Order by: <%= select('preference', 'workload_order_by', ['Due date', 'Importance']) %> Per page: <%= select('preference', 'workload_page_size', ["10", "15", "20", "25", "30", "40"]) %> <%= submit_tag("Go!") %></p> </div><% end %> app/views/tasks/workload.rhtml @@ -48,7 +48,7 @@ <% end %> <% if @workload_columns.include?("Team") %> - <th><%= "Team".t %></th> + <th>Team</th> <% end %> <% if @workload_columns.include?("Listonly") %> @@ -128,6 +128,6 @@ <br /> <% form_tag(:controller => 'tasks', :action => 'quickchangepreferences', :team => @team.id) do %><div> - <p><%= "Show:".t %> <%= select('preference', 'workload_display', workload_display_select_options(@person)) %> <%= "Order by:".t %> <%= select('preference', 'workload_order_by', [["Due date".t, "Due date"], ["Importance".t, "Importance"]]) %> <%= "Per page:".t %> <%= select('preference', 'workload_page_size', ["10", "15", "20", "25", "30", "40"]) %> <%= submit_tag "Go!".t %></p> + <p>Show: <%= select('preference', 'workload_display', workload_display_select_options(@person)) %> Order by: <%= select('preference', 'workload_order_by', ['Due date', 'Importance']) %> Per page: <%= select('preference', 'workload_page_size', ["10", "15", "20", "25", "30", "40"]) %> <%= submit_tag "Go!" %></p> </div><% end %> app/views/teams/teamworkload.rhtml 10386bb1927e16f2cfb54304b7069841393186ad Aimee Daniells aimee@edendevelopment.co.uk http://github.com/sermoa/mychores/commit/4063036f316aba3633506b3e1277bb1ba806844e 4063036f316aba3633506b3e1277bb1ba806844e 2009-04-10T09:19:38-07:00 2009-04-10T09:19:38-07:00 Removed translations from Team workload. All stories now pass again! :) 966cc05ed6d82353e22c3976b90a2039944b89d7 Aimee Daniells aimee@edendevelopment.co.uk