diff app/controllers/issue_categories_controller.rb @ 909:cbb26bc654de redmine-1.3

Update to Redmine 1.3-stable branch (Redmine SVN rev 8964)

--- a/app/controllers/issue_categories_controller.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/app/controllers/issue_categories_controller.rb	Fri Feb 24 19:09:32 2012 +0000
@@ -1,16 +1,16 @@
-# redMine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Redmine - project management software
+# Copyright (C) 2006-2011  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
@@ -18,58 +18,92 @@
 class IssueCategoriesController < ApplicationController
   menu_item :settings
   model_object IssueCategory
-  before_filter :find_model_object, :except => :new
-  before_filter :find_project_from_association, :except => :new
-  before_filter :find_project, :only => :new
+  before_filter :find_model_object, :except => [:index, :new, :create]
+  before_filter :find_project_from_association, :except => [:index, :new, :create]
+  before_filter :find_project, :only => [:index, :new, :create]
   before_filter :authorize
+  accept_api_auth :index, :show, :create, :update, :destroy
   
-  verify :method => :post, :only => :destroy
+  def index
+    respond_to do |format|
+      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
+      format.api { @categories = @project.issue_categories.all }
+    end
+  end
+
+  def show
+    respond_to do |format|
+      format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
+      format.api
+    end
+  end
 
   def new
-    @category = @project.issue_categories.build(params[:category])
-    if request.post?
-      if @category.save
-        respond_to do |format|
-          format.html do
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
-          end
-          format.js do
-            # IE doesn't support the replace_html rjs method for select box options
-            render(:update) {|page| page.replace "issue_category_id",
-              content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
-            }
-          end
+    @category = @project.issue_categories.build(params[:issue_category])
+  end
+
+  verify :method => :post, :only => :create
+  def create
+    @category = @project.issue_categories.build(params[:issue_category])
+    if @category.save
+      respond_to do |format|
+        format.html do
+          flash[:notice] = l(:notice_successful_create)
+          redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
         end
-      else
-        respond_to do |format|
-          format.html
-          format.js do
-            render(:update) {|page| page.alert(@category.errors.full_messages.join('\n')) }
-          end
+        format.js do
+          # IE doesn't support the replace_html rjs method for select box options
+          render(:update) {|page| page.replace "issue_category_id",
+            content_tag('select', '<option></option>' + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
+          }
         end
+        format.api { render :action => 'show', :status => :created, :location => issue_category_path(@category) }
+      end
+    else
+      respond_to do |format|
+        format.html { render :action => 'new'}
+        format.js do
+          render(:update) {|page| page.alert(@category.errors.full_messages.join('\n')) }
+        end
+        format.api { render_validation_errors(@category) }
       end
     end
   end
-  
+
   def edit
-    if request.post? and @category.update_attributes(params[:category])
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+  end
+
+  verify :method => :put, :only => :update
+  def update
+    if @category.update_attributes(params[:issue_category])
+      respond_to do |format|
+        format.html {
+          flash[:notice] = l(:notice_successful_update)
+          redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
+        }
+        format.api { head :ok }
+      end
+    else
+      respond_to do |format|
+        format.html { render :action => 'edit' }
+        format.api { render_validation_errors(@category) }
+      end
     end
   end
 
+  verify :method => :delete, :only => :destroy
   def destroy
     @issue_count = @category.issues.size
-    if @issue_count == 0
-      # No issue assigned to this category
-      @category.destroy
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
-      return
-    elsif params[:todo]
-      reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id]) if params[:todo] == 'reassign'
+    if @issue_count == 0 || params[:todo] || api_request? 
+      reassign_to = nil
+      if params[:reassign_to_id] && (params[:todo] == 'reassign' || params[:todo].blank?)
+        reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id])
+      end
       @category.destroy(reassign_to)
-      redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories'
+      respond_to do |format|
+        format.html { redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' }
+        format.api { head :ok }
+      end
       return
     end
     @categories = @project.issue_categories - [@category]
@@ -81,8 +115,8 @@
   def find_model_object
     super
     @category = @object
-  end    
-  
+  end
+
   def find_project
     @project = Project.find(params[:project_id])
   rescue ActiveRecord::RecordNotFound