diff --git a/tracks/app/controllers/contexts_controller.rb b/tracks/app/controllers/contexts_controller.rb index b0582cef..bf3c4dce 100644 --- a/tracks/app/controllers/contexts_controller.rb +++ b/tracks/app/controllers/contexts_controller.rb @@ -55,7 +55,9 @@ class ContextsController < ApplicationController @saved = @context.save @context_not_done_counts = { @context.id => 0 } respond_to do |format| - format.js + format.js do + @down_count = current_user.contexts.size + end format.xml do if @context.new_record? && params_are_invalid render_failure "Expected post format is valid xml like so: context name.", 400 @@ -95,7 +97,7 @@ class ContextsController < ApplicationController def destroy @context.destroy respond_to do |format| - format.js + format.js { @down_count = current_user.contexts.size } format.xml { render :text => "Deleted context #{@context.name}" } end end @@ -115,6 +117,7 @@ class ContextsController < ApplicationController lambda do @page_title = "TRACKS::List Contexts" @no_contexts = @contexts.empty? + @count = @contexts.size render end end diff --git a/tracks/app/controllers/projects_controller.rb b/tracks/app/controllers/projects_controller.rb index ca344995..6efdfb50 100644 --- a/tracks/app/controllers/projects_controller.rb +++ b/tracks/app/controllers/projects_controller.rb @@ -62,7 +62,7 @@ class ProjectsController < ApplicationController @active_projects_count = current_user.projects.count(:conditions => "state = 'active'") @contexts = current_user.contexts respond_to do |format| - format.js + format.js { @down_count = current_user.projects.size } format.xml do if @project.new_record? && params_are_invalid render_failure "Expected post format is valid xml like so: project name." @@ -130,7 +130,7 @@ class ProjectsController < ApplicationController @hidden_projects_count = current_user.projects.count(:conditions => "state = 'hidden'") @completed_projects_count = current_user.projects.count(:conditions => "state = 'completed'") respond_to do |format| - format.js + format.js { @down_count = current_user.projects.size } format.xml { render :text => "Deleted project #{@project.name}" } end end @@ -157,6 +157,7 @@ class ProjectsController < ApplicationController lambda do init_project_hidden_todo_counts(['project']) @page_title = "TRACKS::List Projects" + @count = current_user.projects.size @active_projects = @projects.select{ |p| p.active? } @hidden_projects = @projects.select{ |p| p.hidden? } @completed_projects = @projects.select{ |p| p.completed? } diff --git a/tracks/app/views/contexts/create.rjs b/tracks/app/views/contexts/create.rjs index 2948bde0..89ee5d93 100644 --- a/tracks/app/views/contexts/create.rjs +++ b/tracks/app/views/contexts/create.rjs @@ -3,6 +3,7 @@ if @saved page.insert_html :bottom, "list-contexts", :partial => 'context_listing', :locals => { :context_listing => @context } page.sortable "list-contexts", get_listing_sortable_options page.hide 'status' + page['badge_count'].replace_html @down_count page.call "Form.reset", "context-form" page.call "Form.focusFirstElement", "context-form" else diff --git a/tracks/app/views/contexts/destroy.rjs b/tracks/app/views/contexts/destroy.rjs index fddfde29..6eb86848 100644 --- a/tracks/app/views/contexts/destroy.rjs +++ b/tracks/app/views/contexts/destroy.rjs @@ -1,5 +1,6 @@ page.visual_effect :fade, dom_id(@context, "container"), :duration => 0.5 page.delay(0.5) do - page[dom_id(@context, "container")].remove + page[dom_id(@context, "container")].remove end +page['badge_count'].replace_html @down_count page.notify :notice, "Deleted context '#{@context.name}'", 5.0 diff --git a/tracks/app/views/projects/create.rjs b/tracks/app/views/projects/create.rjs index d2f81bab..86bbb49b 100644 --- a/tracks/app/views/projects/create.rjs +++ b/tracks/app/views/projects/create.rjs @@ -2,6 +2,7 @@ if @saved and @go_to_project page.redirect_to project_path(@project) elsif @saved page.hide 'status' + page['badge_count'].replace_html @down_count page.hide 'projects-empty-nd' page.show 'list-active-projects-container' page.replace_html "active-projects-count", @active_projects_count diff --git a/tracks/app/views/projects/destroy.rjs b/tracks/app/views/projects/destroy.rjs index c7cf9838..18e22540 100644 --- a/tracks/app/views/projects/destroy.rjs +++ b/tracks/app/views/projects/destroy.rjs @@ -1,12 +1,13 @@ page.visual_effect :fade, dom_id(@project, "container"), :duration => 0.5 page.delay(0.5) do - page[dom_id(@project, "container")].remove - page.replace_html "active-projects-count", @active_projects_count - page.replace_html "hidden-projects-count", @hidden_projects_count - page.replace_html "completed-projects-count", @completed_projects_count - page.set_element_visible ("list-hidden-projects-container", @hidden_projects_count > 0) - page.set_element_visible ("list-active-projects-container", @active_projects_count > 0) - page.set_element_visible ("list-completed-projects-container", @completed_projects_count > 0) + page[dom_id(@project, "container")].remove + page.replace_html "active-projects-count", @active_projects_count + page.replace_html "hidden-projects-count", @hidden_projects_count + page.replace_html "completed-projects-count", @completed_projects_count + page.set_element_visible("list-hidden-projects-container", @hidden_projects_count > 0) + page.set_element_visible("list-active-projects-container", @active_projects_count > 0) + page.set_element_visible("list-completed-projects-container", @completed_projects_count > 0) end page.notify :notice, "Deleted project '#{@project.name}'", 5.0 +page['badge_count'].replace_html @down_count page.hide "busy"