##// END OF EJS Templates
Use content_tag for empty option....
Jean-Philippe Lang -
r8880:0cc60f36314e
parent child
Show More
@@ -1,125 +1,125
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class IssueCategoriesController < ApplicationController
18 class IssueCategoriesController < ApplicationController
19 menu_item :settings
19 menu_item :settings
20 model_object IssueCategory
20 model_object IssueCategory
21 before_filter :find_model_object, :except => [:index, :new, :create]
21 before_filter :find_model_object, :except => [:index, :new, :create]
22 before_filter :find_project_from_association, :except => [:index, :new, :create]
22 before_filter :find_project_from_association, :except => [:index, :new, :create]
23 before_filter :find_project, :only => [:index, :new, :create]
23 before_filter :find_project, :only => [:index, :new, :create]
24 before_filter :authorize
24 before_filter :authorize
25 accept_api_auth :index, :show, :create, :update, :destroy
25 accept_api_auth :index, :show, :create, :update, :destroy
26
26
27 def index
27 def index
28 respond_to do |format|
28 respond_to do |format|
29 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
29 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
30 format.api { @categories = @project.issue_categories.all }
30 format.api { @categories = @project.issue_categories.all }
31 end
31 end
32 end
32 end
33
33
34 def show
34 def show
35 respond_to do |format|
35 respond_to do |format|
36 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
36 format.html { redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project }
37 format.api
37 format.api
38 end
38 end
39 end
39 end
40
40
41 def new
41 def new
42 @category = @project.issue_categories.build(params[:issue_category])
42 @category = @project.issue_categories.build(params[:issue_category])
43 end
43 end
44
44
45 verify :method => :post, :only => :create
45 verify :method => :post, :only => :create
46 def create
46 def create
47 @category = @project.issue_categories.build(params[:issue_category])
47 @category = @project.issue_categories.build(params[:issue_category])
48 if @category.save
48 if @category.save
49 respond_to do |format|
49 respond_to do |format|
50 format.html do
50 format.html do
51 flash[:notice] = l(:notice_successful_create)
51 flash[:notice] = l(:notice_successful_create)
52 redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
52 redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
53 end
53 end
54 format.js do
54 format.js do
55 # IE doesn't support the replace_html rjs method for select box options
55 # IE doesn't support the replace_html rjs method for select box options
56 render(:update) {|page| page.replace "issue_category_id",
56 render(:update) {|page| page.replace "issue_category_id",
57 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]')
57 content_tag('select', content_tag('option') + options_from_collection_for_select(@project.issue_categories, 'id', 'name', @category.id), :id => 'issue_category_id', :name => 'issue[category_id]')
58 }
58 }
59 end
59 end
60 format.api { render :action => 'show', :status => :created, :location => issue_category_path(@category) }
60 format.api { render :action => 'show', :status => :created, :location => issue_category_path(@category) }
61 end
61 end
62 else
62 else
63 respond_to do |format|
63 respond_to do |format|
64 format.html { render :action => 'new'}
64 format.html { render :action => 'new'}
65 format.js do
65 format.js do
66 render(:update) {|page| page.alert(@category.errors.full_messages.join('\n')) }
66 render(:update) {|page| page.alert(@category.errors.full_messages.join('\n')) }
67 end
67 end
68 format.api { render_validation_errors(@category) }
68 format.api { render_validation_errors(@category) }
69 end
69 end
70 end
70 end
71 end
71 end
72
72
73 def edit
73 def edit
74 end
74 end
75
75
76 verify :method => :put, :only => :update
76 verify :method => :put, :only => :update
77 def update
77 def update
78 if @category.update_attributes(params[:issue_category])
78 if @category.update_attributes(params[:issue_category])
79 respond_to do |format|
79 respond_to do |format|
80 format.html {
80 format.html {
81 flash[:notice] = l(:notice_successful_update)
81 flash[:notice] = l(:notice_successful_update)
82 redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
82 redirect_to :controller => 'projects', :action => 'settings', :tab => 'categories', :id => @project
83 }
83 }
84 format.api { head :ok }
84 format.api { head :ok }
85 end
85 end
86 else
86 else
87 respond_to do |format|
87 respond_to do |format|
88 format.html { render :action => 'edit' }
88 format.html { render :action => 'edit' }
89 format.api { render_validation_errors(@category) }
89 format.api { render_validation_errors(@category) }
90 end
90 end
91 end
91 end
92 end
92 end
93
93
94 verify :method => :delete, :only => :destroy
94 verify :method => :delete, :only => :destroy
95 def destroy
95 def destroy
96 @issue_count = @category.issues.size
96 @issue_count = @category.issues.size
97 if @issue_count == 0 || params[:todo] || api_request?
97 if @issue_count == 0 || params[:todo] || api_request?
98 reassign_to = nil
98 reassign_to = nil
99 if params[:reassign_to_id] && (params[:todo] == 'reassign' || params[:todo].blank?)
99 if params[:reassign_to_id] && (params[:todo] == 'reassign' || params[:todo].blank?)
100 reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id])
100 reassign_to = @project.issue_categories.find_by_id(params[:reassign_to_id])
101 end
101 end
102 @category.destroy(reassign_to)
102 @category.destroy(reassign_to)
103 respond_to do |format|
103 respond_to do |format|
104 format.html { redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' }
104 format.html { redirect_to :controller => 'projects', :action => 'settings', :id => @project, :tab => 'categories' }
105 format.api { head :ok }
105 format.api { head :ok }
106 end
106 end
107 return
107 return
108 end
108 end
109 @categories = @project.issue_categories - [@category]
109 @categories = @project.issue_categories - [@category]
110 end
110 end
111
111
112 private
112 private
113 # Wrap ApplicationController's find_model_object method to set
113 # Wrap ApplicationController's find_model_object method to set
114 # @category instead of just @issue_category
114 # @category instead of just @issue_category
115 def find_model_object
115 def find_model_object
116 super
116 super
117 @category = @object
117 @category = @object
118 end
118 end
119
119
120 def find_project
120 def find_project
121 @project = Project.find(params[:project_id])
121 @project = Project.find(params[:project_id])
122 rescue ActiveRecord::RecordNotFound
122 rescue ActiveRecord::RecordNotFound
123 render_404
123 render_404
124 end
124 end
125 end
125 end
General Comments 0
You need to be logged in to leave comments. Login now