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

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

--- a/app/controllers/versions_controller.rb	Fri Feb 24 18:36:29 2012 +0000
+++ b/app/controllers/versions_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.
@@ -23,39 +23,53 @@
   before_filter :find_project, :only => [:index, :new, :create, :close_completed]
   before_filter :authorize
 
+  accept_api_auth :index, :create, :update, :destroy
+
   helper :custom_fields
   helper :projects
 
   def index
-    @trackers = @project.trackers.find(:all, :order => 'position')
-    retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
-    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-    project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
-    
-    @versions = @project.shared_versions || []
-    @versions += @project.rolled_up_versions.visible if @with_subprojects
-    @versions = @versions.uniq.sort
-    @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
-    
-    @issues_by_version = {}
-    unless @selected_tracker_ids.empty?
-      @versions.each do |version|
-        issues = version.fixed_issues.visible.find(:all,
-                                                   :include => [:project, :status, :tracker, :priority],
-                                                   :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
-                                                   :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
-        @issues_by_version[version] = issues
-      end
+    respond_to do |format|
+      format.html {
+        @trackers = @project.trackers.find(:all, :order => 'position')
+        retrieve_selected_tracker_ids(@trackers, @trackers.select {|t| t.is_in_roadmap?})
+        @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+        project_ids = @with_subprojects ? @project.self_and_descendants.collect(&:id) : [@project.id]
+
+        @versions = @project.shared_versions || []
+        @versions += @project.rolled_up_versions.visible if @with_subprojects
+        @versions = @versions.uniq.sort
+        @versions.reject! {|version| version.closed? || version.completed? } unless params[:completed]
+
+        @issues_by_version = {}
+        unless @selected_tracker_ids.empty?
+          @versions.each do |version|
+            issues = version.fixed_issues.visible.find(:all,
+                                                       :include => [:project, :status, :tracker, :priority],
+                                                       :conditions => {:tracker_id => @selected_tracker_ids, :project_id => project_ids},
+                                                       :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
+            @issues_by_version[version] = issues
+          end
+        end
+        @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
+      }
+      format.api {
+        @versions = @project.shared_versions.all
+      }
     end
-    @versions.reject! {|version| !project_ids.include?(version.project_id) && @issues_by_version[version].blank?}
   end
-  
+
   def show
-    @issues = @version.fixed_issues.visible.find(:all,
-      :include => [:status, :tracker, :priority],
-      :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
+    respond_to do |format|
+      format.html {
+        @issues = @version.fixed_issues.visible.find(:all,
+          :include => [:status, :tracker, :priority],
+          :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
+      }
+      format.api
+    end
   end
-  
+
   def new
     @version = @project.versions.build
     if params[:version]
@@ -79,7 +93,7 @@
         respond_to do |format|
           format.html do
             flash[:notice] = l(:notice_successful_create)
-            redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+            redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
           end
           format.js do
             # IE doesn't support the replace_html rjs method for select box options
@@ -87,6 +101,9 @@
               content_tag('select', '<option></option>' + version_options_for_select(@project.shared_versions.open, @version), :id => 'issue_fixed_version_id', :name => 'issue[fixed_version_id]')
             }
           end
+          format.api do
+            render :action => 'show', :status => :created, :location => version_url(@version)
+          end
         end
       else
         respond_to do |format|
@@ -94,6 +111,7 @@
           format.js do
             render(:update) {|page| page.alert(@version.errors.full_messages.join('\n')) }
           end
+          format.api  { render_validation_errors(@version) }
         end
       end
     end
@@ -101,22 +119,28 @@
 
   def edit
   end
-  
+
   def update
     if request.put? && params[:version]
       attributes = params[:version].dup
       attributes.delete('sharing') unless @version.allowed_sharings.include?(attributes['sharing'])
       if @version.update_attributes(attributes)
-        flash[:notice] = l(:notice_successful_update)
-        redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+        respond_to do |format|
+          format.html {
+            flash[:notice] = l(:notice_successful_update)
+            redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+          }
+          format.api  { head :ok }
+        end
       else
         respond_to do |format|
           format.html { render :action => 'edit' }
+          format.api  { render_validation_errors(@version) }
         end
       end
     end
   end
-  
+
   def close_completed
     if request.put?
       @project.close_completed_versions
@@ -124,16 +148,25 @@
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   end
 
+  verify :method => :delete, :only => :destroy, :render => {:nothing => true, :status => :method_not_allowed }
   def destroy
     if @version.fixed_issues.empty?
       @version.destroy
-      redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+      respond_to do |format|
+        format.html { redirect_back_or_default :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project }
+        format.api  { head :ok }
+      end
     else
-      flash[:error] = l(:notice_unable_delete_version)
-      redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+      respond_to do |format|
+        format.html {
+          flash[:error] = l(:notice_unable_delete_version)
+          redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
+        }
+        format.api  { head :unprocessable_entity }
+      end
     end
   end
-  
+
   def status_by
     respond_to do |format|
       format.html { render :action => 'show' }