Merge commit 'upstream/master'

app/controllers/application.rb

@@ -228,8 +228,13 @@ class ApplicationController < ActionController::Base
   end
     
   def init_data_for_sidebar
-    @projects = @projects || current_user.projects.find(:all, :include => [:default_context ])
-    @contexts = @contexts || current_user.contexts
+    @completed_projects = current_user.projects.completed
+    @hidden_projects = current_user.projects.hidden
+    @active_projects = current_user.projects.active
+
+    @active_contexts = current_user.contexts.active
+    @hidden_contexts = current_user.contexts.hidden
+
     init_not_done_counts
     if prefs.show_hidden_projects_in_sidebar
       init_project_hidden_todo_counts(['project'])
@@ -238,13 +243,13 @@ class ApplicationController < ActionController::Base
   
   def init_not_done_counts(parents = ['project','context'])
     parents.each do |parent|
-      eval("@#{parent}_not_done_counts = @#{parent}_not_done_counts || Todo.count(:conditions => ['user_id = ? and state = ?', current_user.id, 'active'], :group => :#{parent}_id)")
+      eval("@#{parent}_not_done_counts = @#{parent}_not_done_counts || current_user.todos.active.count(:group => :#{parent}_id)")
     end
   end
   
   def init_project_hidden_todo_counts(parents = ['project','context'])
     parents.each do |parent|
-      eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || Todo.count(:conditions => ['user_id = ? and (state = ? or state = ?)', current_user.id, 'project_hidden', 'active'], :group => :#{parent}_id)")
+      eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || current_user.todos.count(:conditions => ['state = ? or state = ?', 'project_hidden', 'active'], :group => :#{parent}_id)")
     end
   end  
   

app/controllers/contexts_controller.rb

@@ -201,6 +201,9 @@ class ContextsController < ApplicationController
         :conditions => ['todos.state = ? AND (todos.project_id IS ? OR projects.state = ?)', 'active', nil, 'active'], 
         :order => "todos.due IS NULL, todos.due ASC, todos.created_at ASC", 
         :include => [:project, :tags])
+
+      @projects = current_user.projects
+
       @count = @not_done_todos.size
       @default_project_context_name_map = build_default_project_context_name_map(@projects).to_json
     end

app/controllers/search_controller.rb

@@ -1,27 +1,30 @@
-class SearchController < ApplicationController
-
-  helper :todos, :application, :notes, :projects  
-  
-  def results
-    @source_view = params['_source_view'] || 'search'
-    @page_title = "TRACKS::Search Results for #{params[:search]}"
-    terms = '%' + params[:search] + '%'
-    @found_todos = current_user.todos.find(:all, :conditions => ["todos.description LIKE ? OR todos.notes LIKE ?", terms, terms], :include => [:tags, :project, :context])
-    @found_projects = current_user.projects.find(:all, :conditions => ["name LIKE ? or description LIKE ?", terms, terms])
-    @found_notes = current_user.notes.find(:all, :conditions => ["body LIKE ?", terms])
- 
-    @count = @found_todos.size  + @found_projects.size + @found_notes.size
-   
-    init_not_done_counts(['project'])
-    init_project_hidden_todo_counts(['project'])
-  end
-
-  def index
-    @page_title = "TRACKS::Search"    
-  end
-  
-  def init
-    @source_view = params['_source_view'] || 'search'
-  end
-
-end
+class SearchController < ApplicationController
+
+  helper :todos, :application, :notes, :projects  
+  
+  def results
+    @source_view = params['_source_view'] || 'search'
+    @page_title = "TRACKS::Search Results for #{params[:search]}"
+    terms = '%' + params[:search] + '%'
+    @found_todos = current_user.todos.find(:all, :conditions => ["todos.description LIKE ? OR todos.notes LIKE ?", terms, terms], :include => [:tags, :project, :context])
+    @found_projects = current_user.projects.find(:all, :conditions => ["name LIKE ? OR description LIKE ?", terms, terms])
+    @found_notes = current_user.notes.find(:all, :conditions => ["body LIKE ?", terms])
+    @found_contexts = current_user.contexts.find(:all, :conditions => ["name LIKE ?", terms])
+    # TODO: limit search to tags on todos
+    @found_tags = current_user.tags.find(:all, :conditions => ["name LIKE ?", terms])
+ 
+    @count = @found_todos.size  + @found_projects.size + @found_notes.size + @found_contexts.size + @found_tags.size
+   
+    init_not_done_counts
+    init_project_hidden_todo_counts
+  end
+
+  def index
+    @page_title = "TRACKS::Search"    
+  end
+  
+  def init
+    @source_view = params['_source_view'] || 'search'
+  end
+
+end

app/controllers/todos_controller.rb

@@ -399,8 +399,9 @@ class TodosController < ApplicationController
       :limit => max_completed, 
       :conditions => ['taggings.user_id = ? and state = ?', current_user.id, 'completed'], 
       :order => 'todos.completed_at DESC')
-    
-    @contexts = current_user.contexts.find(:all)
+
+    @projects = current_user.projects
+    @contexts = current_user.contexts
     @contexts_to_show = @contexts.reject {|x| x.hide? }
     
     # Set count badge to number of items with this tag

app/helpers/todos_helper.rb

@@ -242,13 +242,13 @@ module TodosHelper
   end
   
   def project_names_for_autocomplete
-    array_or_string_for_javascript( ['None'] + @projects.select{ |p| p.active? }.collect{|p| escape_javascript(p.name) } )
+    array_or_string_for_javascript( ['None'] + current_user.projects.active.collect{|p| escape_javascript(p.name) } )
   end
   
   def context_names_for_autocomplete
     # #return array_or_string_for_javascript(['Create a new context']) if
     # @contexts.empty?
-    array_or_string_for_javascript( @contexts.collect{|c| escape_javascript(c.name) } )
+    array_or_string_for_javascript( current_user.contexts.collect{|c| escape_javascript(c.name) } )
   end
 
   def format_ical_notes(notes)

app/models/user.rb

@@ -124,7 +124,7 @@ class User < ActiveRecord::Base
 
   #for will_paginate plugin
   cattr_accessor :per_page
-  @@per_page = 1
+  @@per_page = 5
   
   def validate
     unless Tracks::Config.auth_schemes.include?(auth_type)

app/views/contexts/_context_listing.rhtml

@@ -1,9 +1,14 @@
-<%  context = context_listing %>
+<%  context = context_listing 
+    suppress_drag_handle ||= false
+    suppress_edit_button ||= false
+%>
 <div id="<%= dom_id(context, "container") %>" class="list">
   <div id="<%= dom_id(context) %>" class="context sortable_row" style="display:'';">
-    <div class="position">
-      <span class="handle">DRAG</span>
-    </div>
+    <% unless suppress_drag_handle -%>
+      <div class="position">
+        <span class="handle">DRAG</span>
+      </div>
+    <% end -%>
     <div class="data">
       <%= link_to_context( context ) %> <%= " (" + count_undone_todos_phrase(context,"actions") + ")" %>
     </div>
@@ -32,5 +37,5 @@
       -%>
     </div>
   </div>
-  <%= render :partial => 'context_form', :object => context %>
+  <%= render :partial => 'contexts/context_form', :object => context %>
 </div>

app/views/projects/_default_context_autocomplete.rhtml

@@ -1,6 +1,6 @@
 <div class="page_name_auto_complete" id="default_context_list" style="display:none;z-index:9999"></div>
 <script type="text/javascript">
-defaultContextAutoCompleter = new Autocompleter.Local('project[default_context_name]', 'default_context_list', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
-Event.observe($('project[default_context_name]'), "focus", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
-Event.observe($('project[default_context_name]'), "click", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
+defaultContextAutoCompleter = new Autocompleter.Local('project_default_context_name', 'default_context_list', <%= context_names_for_autocomplete %>, {choices:100,autoSelect:false});
+Event.observe($('project_default_context_name'), "focus", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
+Event.observe($('project_default_context_name'), "click", defaultContextAutoCompleter.activate.bind(defaultContextAutoCompleter));
 </script>

app/views/search/index.rhtml

@@ -1,6 +1,9 @@
-<div id="display_box_search">
-  <% form_tag(:action => :results) do %>
-    <%= text_field_tag(:search, params[:search]) %>
-    <%= submit_tag "Search" %>   
-  <% end %>
-</div>
+<div id="display_box_search">
+  <% form_tag({:action => :results}, :id => 'search-form') do %>
+    <%= text_field_tag(:search, params[:search]) %>
+    <%= submit_tag "Search" %>
+  <% end %>
+</div>
+<script type="text/javascript">
+  Form.focusFirstElement('search-form')
+</script>

app/views/search/results.rhtml

@@ -1,32 +1,48 @@
-<div id="display_box_results">
-  <% if @count == 0 -%>
-    <div class="message"><p>Your search yielded no results.</p></div>
-  <% else -%>
-    <% source_view_is = :search %>
-    <% parent_container_type = 'search' %>
-    <% if not @found_todos.empty? -%>
-      <div id="found-todos-container" class="container">
-        <h2><span id="found-todos-count" class="badge"><%= @found_todos.size %></span>Todos matching query</h2>
-        <%= render :partial => "todos/todo", :collection => @found_todos, :locals => { :parent_container_type => 'search', :suppress_context => false, :suppress_project => false, :suppress_edit_button => true } %>	
-      </div>
-    <% end -%>
-  
-    <% if not @found_projects.empty? -%>
-      <div id="found-projects-container" class="container">
-        <h2><span id="found-projects-count" class="badge"><%= @found_projects.size %></span>Projects matching query</h2>
-        <%= render :partial => "projects/project_listing", :collection => @found_projects, :locals => { :suppress_drag_handle => true, :suppress_edit_button => true } %>
-      </div>	
-    <% end -%>
-  
-    <% if not @found_notes.empty? -%>
-      <div id="found-notes-container" class="container">
-        <h2><span id="found-notes-count" class="badge"><%= @found_notes.size %></span>Notes matching query</h2>
-        <% for notes in @found_notes -%>
-          <div class="container" id="note-<%= notes.id %>-wrapper">
-            <%= render :partial => "notes/notes_summary", :object => notes %>
-          </div>
-        <% end -%>
-      </div>
-    <% end -%>
-  <% end -%>
-</div>
+<div id="display_box_results">
+<% if @count == 0 -%>
+  <div class="message"><p>Your search yielded no results.</p></div>
+<% else -%>
+  <% unless @found_todos.empty? -%>
+    <div id="found-todos-container" class="container">
+      <h2><span id="found-todos-count" class="badge"><%= @found_todos.size %></span>Todos matching query</h2>
+      <%= render :partial => "todos/todo", :collection => @found_todos, :locals => { :parent_container_type => 'search', :suppress_context => false, :suppress_project => false, :suppress_edit_button => true } %>
+    </div>
+  <% end -%>
+
+  <% unless @found_projects.empty? -%>
+    <div id="found-projects-container" class="container">
+      <h2><span id="found-projects-count" class="badge"><%= @found_projects.size %></span>Projects matching query</h2>
+      <%= render :partial => "projects/project_listing", :collection => @found_projects, :locals => { :suppress_drag_handle => true, :suppress_edit_button => true } %>
+    </div>
+  <% end -%>
+
+  <% unless @found_notes.empty? -%>
+    <div id="found-notes-container" class="container">
+      <h2><span id="found-notes-count" class="badge"><%= @found_notes.size %></span>Notes matching query</h2>
+      <% for notes in @found_notes -%>
+        <div class="container" id="note-<%= notes.id %>-wrapper">
+          <%= render :partial => "notes/notes_summary", :object => notes %>
+        </div>
+      <% end -%>
+    </div>
+  <% end -%>
+
+  <% unless @found_contexts.empty? -%>
+    <div id="found-contexts-container" class="container">
+      <h2><span id="found-contexts-count" class="badge"><%= @found_contexts.size %></span>Contexts matching query</h2>
+      <%= render :partial => "contexts/context_listing", :collection => @found_contexts, :locals => { :suppress_drag_handle => true, :suppress_edit_button => true } %>
+    </div>
+  <% end -%>
+
+  <% unless @found_tags.empty? -%>
+    <div id="found-tags-container" class="container">
+    <h2><span id="found-tags-count" class="badge"><%= @found_tags.size %></span>Tags matching query</h2>
+    <span class="tags"><%  @found_tags.each do |tag| -%>
+        <span class="tag"><%= link_to tag.name, {:controller => "todos", :action => "tag", :id => tag.name} -%></span>
+      <% end %>
+    </span>
+    <br/>
+    </div>
+  <% end %>
+<% end -%>
+</div>

app/views/shared/_add_new_item_form.rhtml

@@ -2,7 +2,7 @@
   @todo = nil
   @initial_context_name = @context.name unless @context.nil?
   @initial_context_name ||= @project.default_context.name unless @project.nil? || @project.default_context.nil? 
-  @initial_context_name ||= @contexts[0].name unless @contexts[0].nil?
+  @initial_context_name ||= current_user.contexts.first.name unless current_user.contexts.first.nil?
   @initial_project_name = @project.name unless @project.nil?
 %>
 <div id="todo_new_action_container">

app/views/sidebar/sidebar.html.erb

@@ -1,30 +1,30 @@
 <div id="sidebar">
-        <% # show active items before hidden / completed items -%>
+    <% # show active items before hidden / completed items -%>
 
 	<%= render :partial => "sidebar/project_list",
 	           :locals => { :list_name => 'Active Projects',
-	           				:projects => @projects.select{|p| p.active? } } -%>
+	           				:projects => @active_projects } -%>
 	
 	<%= render :partial => "sidebar/context_list",
 	           :locals => { :list_name => 'Active Contexts',
-	           				:contexts => @contexts.reject{|c| c.hide? } } -%>
+	           				:contexts => @active_contexts } -%>
 
 	<% if prefs.show_hidden_projects_in_sidebar -%>
         <%= render :partial => "sidebar/project_list",
                    :locals => { :list_name => 'Hidden Projects',
-			 			  :projects => @projects.select{|p| p.hidden? } } -%>
+			 			  :projects => @hidden_projects } -%>
 	<% end -%>
 
 	<% if prefs.show_completed_projects_in_sidebar -%>
         <%= render :partial => "sidebar/project_list",
                    :locals => { :list_name => 'Completed Projects',
-             			  :projects => @projects.select{|p| p.completed? } } -%>
+             			  :projects => @completed_projects } -%>
 	<% end -%>
 
 	<% if prefs.show_hidden_contexts_in_sidebar -%>
 	<%= render :partial => "sidebar/context_list",
 	           :locals => { :list_name => 'Hidden Contexts',
-	           				:contexts => @contexts.select{|c| c.hide? } } -%>
+	           				:contexts => @hidden_contexts } -%>
 	<% end -%>
 	
 	<div class="integrations-link"><ul>

app/views/todos/create.js.rjs

@@ -16,7 +16,7 @@ if @saved
       page.insert_html :top, 'display_box', :partial => 'contexts/context', :locals => { :context => @todo.context, :collapsible => true }
     else
       page.call "todoItems.ensureVisibleWithEffectAppear", "c#{@todo.context_id}" if source_view_is_one_of(:todo, :deferred)
-      page.insert_html :bottom, item_container_id(@todo) + 'items', :partial => 'todos/todo', :locals => { :parent_container_type => parent_container_type, :source_view => @source_view }
+      page.insert_html :bottom, item_container_id(@todo) + 'items', :partial => 'todos/todo', :locals => { :todo => @todo, :parent_container_type => parent_container_type, :source_view => @source_view }
       page.visual_effect :highlight, dom_id(@todo), :duration => 3
       page[empty_container_msg_div_id].hide unless empty_container_msg_div_id.nil?
     end

app/views/todos/index.html.erb

@@ -10,5 +10,7 @@
 
 <div id="input_box">
   <%= render :partial => "shared/add_new_item_form" %>
-  <%= render :template => "sidebar/sidebar" %>
+  <%- # TODO: this used to be render :template, but somehow it was not
+      #rendered after the rails2.2.2 upgrade -%>
+  <%= render :file => "sidebar/sidebar.html.erb" %>
 </div><!-- End of input box -->

test/selenium/project_detail/changing_project_name_should_change_default_project.rsel

@@ -0,0 +1,13 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/projects/1"
+
+# change project name
+click "project_name_in_place_editor"
+wait_for_element_present "css=#project_name_in_place_editor-inplaceeditor input.editor_field"
+type "css=#project_name_in_place_editor-inplaceeditor input.editor_field", "Test Foo"
+click "css=#project_name_in_place_editor-inplaceeditor input.editor_ok_button"
+wait_for_text "project_name_in_place_editor", "Test Foo"
+
+# check that the default project name is changed too
+assert_value "todo_project_name", "Test Foo"

test/selenium/tags/change_context_in_tag_view.rsel

@@ -0,0 +1,17 @@
+setup :fixtures => :all
+login :as => 'admin'
+open "/todos/tag/foo"
+wait_for_element_present "xpath=//div[@id='c1'] //h2"
+
+# change context name
+click "edit_icon_todo_1"
+wait_for_element_present "submit_todo_1"
+type "//input[@name='context_name']", "call"
+click "//button[@id='submit_todo_1']"
+wait_for_visible "flash"
+
+# check context agenda is gone
+wait_for_not_visible "c1"
+verify_text_present "Call Bill Gates to find out how much he makes per day"
+
+

test/selenium/users/delete_user.rsel

@@ -0,0 +1,7 @@
+setup :fixtures => :all
+login :as => 'admin'
+open '/users'
+assert_text_present "John Deere"
+click "//tr[@id='user-3']//img"
+assert_confirmation "Warning: this will delete user 'john', all their actions, contexts, project and notes. Are you sure that you want to continue?"
+wait_for_text_not_present "John Deere"