Upgraded to Rails version to 1-2-pre-release branch revision 5704. Lots of stuff is deprecated in Rails 1.2, so this changeset

also removes deprecated methods. All tests pass (at least on my machine!) and raise no deprecation warnings.



git-svn-id: http://www.rousette.org.uk/svn/tracks-repos/trunk@365 a4c988fc-2ded-0310-b66e-134b36920a42

tracks/app/controllers/application.rb

@@ -20,7 +20,7 @@ class ApplicationController < ActionController::Base
 
   # By default, sets the charset to UTF-8 if it isn't already set
   def set_charset
-    @headers["Content-Type"] ||= "text/html; charset=UTF-8" 
+    headers["Content-Type"] ||= "text/html; charset=UTF-8" 
   end
 
   # Reverses the urlize() method by substituting underscores for spaces

tracks/app/controllers/context_controller.rb

@@ -36,6 +36,10 @@ class ContextController < ApplicationController
   #                    http://our.tracks.host/context/create
   #
   def create
+    if params[:format] == 'application/xml' && params['exception']
+      render_failure "Expected post format is valid xml like so: <request><context><name>context name</name></context></request>."
+      return
+    end
     @context = @user.contexts.build
     params_are_invalid = true
     if (params['context'] || (params['request'] && params['request']['context']))
@@ -49,9 +53,9 @@ class ContextController < ApplicationController
       wants.js
       wants.xml do
         if @context.new_record? && params_are_invalid
-          render_failure "Expected post format is xml like so: <request><context><name>context name</name></context></request>."
+          render_failure "Expected post format is valid xml like so: <request><context><name>context name</name></context></request>."
         elsif @context.new_record?
-          render_failure @context.errors.full_messages.join(', ')
+          render_failure @context.errors.to_xml
         else
           render :xml => @context.to_xml( :except => :user_id )
         end

tracks/app/controllers/feed_controller.rb

@@ -3,7 +3,6 @@
 class FeedController < ApplicationController
 
   helper :feed
-  model :todo, :context, :project
   session :disabled => true, :except => 'index' # Prevents session control from interfering with feed
 
   before_filter :check_token_against_user_word, :except => 'index'

tracks/app/controllers/login_controller.rb

@@ -1,5 +1,4 @@
 class LoginController < ApplicationController
-  model   :user, :preference
   layout  'login'
   skip_before_filter :set_session_expiration
   open_id_consumer if Tracks::Config.auth_schemes.include?('open_id')
@@ -78,7 +77,7 @@ class LoginController < ApplicationController
   end
 
   def signup
-    if User.find_all.empty? # the first user of the system
+    if User.no_users_yet?
       @page_title = "Sign up as the admin user"
       @user = get_new_user
     else
@@ -102,7 +101,7 @@ class LoginController < ApplicationController
       return
     end
 
-    user.is_admin = true if User.find_all.empty?
+    user.is_admin = true if User.no_users_yet?
     if user.save
       @user = User.authenticate(user.login, params['user']['password'])
       @user.create_preference

tracks/app/controllers/mobile_controller.rb

@@ -1,10 +1,5 @@
 class MobileController < ApplicationController
-  
-  model :user
-  model :project
-  model :context
-  model :todo
-  
+
   layout 'mobile'
   
   prepend_before_filter :login_required
@@ -36,16 +31,10 @@ class MobileController < ApplicationController
         @item.state = "active"
       end
     else
-      if params[:item][:"show_from(1i)"] == ""
-        @item = Todo.create(params[:item]) if params[:item]
-      else
-        @item = Todo.create(params[:item]) if params[:item]
-        @item.defer!
-      end
+      params[:item][:user_id] = @user.id
+      @item = Todo.new(params[:item]) if params[:item]
     end
-    
-    @item.user_id = @user.id
-    
+        
     if @item.save
       redirect_to :action => 'index'
     else

tracks/app/controllers/note_controller.rb

@@ -1,6 +1,5 @@
 class NoteController < ApplicationController
 
-  model :user
   prepend_before_filter :login_required
 
   layout "standard"

tracks/app/controllers/project_controller.rb

@@ -1,7 +1,5 @@
 class ProjectController < ApplicationController
 
-  model :todo
-
   helper :todo
   prepend_before_filter :login_required
   before_filter :init, :except => [:create, :destroy, :order, :toggle_project_done]
@@ -62,6 +60,10 @@ class ProjectController < ApplicationController
   #                    http://our.tracks.host/project/create
   #
   def create
+    if params[:format] == 'application/xml' && params['exception']
+      render_failure "Expected post format is valid xml like so: <request><project><name>project name</name></project></request>."
+      return
+    end
     @project = @user.projects.build
     params_are_invalid = true
     if (params['project'] || (params['request'] && params['request']['project']))
@@ -75,7 +77,7 @@ class ProjectController < ApplicationController
       wants.js
       wants.xml do
         if @project.new_record? && params_are_invalid
-          render_failure "Expected post format is xml like so: <request><project><name>project name</name></project></request>."
+          render_failure "Expected post format is valid xml like so: <request><project><name>project name</name></project></request>."
         elsif @project.new_record?
           render_failure @project.errors.full_messages.join(', ')
         else

tracks/app/controllers/todo_controller.rb

@@ -1,9 +1,5 @@
 class TodoController < ApplicationController
 
-  model :user
-  model :project
-  model :context
-  
   helper :todo
 
   prepend_before_filter :login_required
@@ -130,6 +126,7 @@ class TodoController < ApplicationController
     if @saved
       @remaining_undone_in_context = @user.contexts.find(@item.context_id).not_done_todo_count
       determine_down_count
+      determine_completed_count
     end
     return if request.xhr?
 
@@ -312,5 +309,21 @@ class TodoController < ApplicationController
          end
       end
     end 
-      
+    
+    def determine_completed_count
+      source_view do |from|
+         from.todo do
+           @completed_count = Todo.count_by_sql(['SELECT COUNT(*) FROM todos, contexts WHERE todos.context_id = contexts.id and todos.user_id = ? and todos.state = ? and contexts.hide = ?', @user.id, 'completed', false])
+         end
+         from.context do
+           @completed_count = @user.contexts.find(@item.context_id).todos.count_in_state(:completed)
+         end
+         from.project do
+           unless @item.project_id == nil
+             @completed_count = @user.projects.find(@item.project_id).todos.count_in_state(:completed)
+           end
+         end
+      end
+    end
+          
 end

tracks/app/controllers/user_controller.rb

@@ -7,7 +7,7 @@ class UserController < ApplicationController
   end
   
   verify  :method => :post,
-          :only => %w( create_user ),
+          :only => %w( create ),
           :render => { :text => '403 Forbidden: Only POST requests on this resource are allowed.',
                       :status => 403 }
   
@@ -17,30 +17,26 @@ class UserController < ApplicationController
   #               http://our.tracks.host/user/create
   #
   def create
+     if params['exception']
+       render_failure "Expected post format is valid xml like so: <request><login>username</login><password>abc123</password></request>."
+       return
+     end
+
      admin = User.find_admin
-     #logger.debug "user is " + session["user_id"].to_s + " and admin is " + a.id.to_s
       unless session["user_id"].to_i == admin.id.to_i
         access_denied
         return
       end
-      unless request.content_type == "application/xml"
-        render_failure "Content Type must be application/xml."
-        return
-      end
       unless check_create_user_params
-        render_failure "Expected post format is xml like so: <request><login>username</login><password>abc123</password></request>."
+        render_failure "Expected post format is valid xml like so: <request><login>username</login><password>abc123</password></request>."
         return
       end
       user = User.new(params[:request])
       user.password_confirmation = params[:request][:password]
-      unless user.valid?
-        render_failure user.errors.full_messages.join(', ')
-        return
-      end
       if user.save
         render :text => "User created.", :status => 200
       else
-        render_failure "Failed to create user."
+        render_failure user.errors.to_xml
       end
   end