summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorEric Davis <edavis@littlestreamsoftware.com>2010-09-07 15:00:27 +0000
committerEric Davis <edavis@littlestreamsoftware.com>2010-09-07 15:00:27 +0000
commit2295b61cb6fde4187875478170da2ae70f114497 (patch)
tree0723ec5425093f75e615ec89bf560bddc6106826 /app
parent06878e50041117baa1b4bde40671ab422dd9bc0a (diff)
downloadredmine-2295b61cb6fde4187875478170da2ae70f114497.tar.gz
redmine-2295b61cb6fde4187875478170da2ae70f114497.zip
Refactor: rename method ProjectsController#add to ProjectsController#new
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4069 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/controllers/projects_controller.rb11
-rw-r--r--app/views/admin/projects.rhtml2
-rw-r--r--app/views/projects/index.rhtml2
-rw-r--r--app/views/projects/new.html.erb (renamed from app/views/projects/add.rhtml)0
4 files changed, 7 insertions, 8 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 65f346d5f..376034097 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -20,9 +20,9 @@ class ProjectsController < ApplicationController
menu_item :roadmap, :only => :roadmap
menu_item :settings, :only => :settings
- before_filter :find_project, :except => [ :index, :list, :add, :create, :copy ]
- before_filter :authorize, :except => [ :index, :list, :add, :create, :copy, :archive, :unarchive, :destroy]
- before_filter :authorize_global, :only => [:add, :create]
+ before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
+ before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
+ before_filter :authorize_global, :only => [:new, :create]
before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
accept_key_auth :index
@@ -60,8 +60,7 @@ class ProjectsController < ApplicationController
end
end
- # Add a new project
- def add
+ def new
@issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
@trackers = Tracker.all
@project = Project.new(params[:project])
@@ -95,7 +94,7 @@ class ProjectsController < ApplicationController
end
else
respond_to do |format|
- format.html { render :action => 'add' }
+ format.html { render :action => 'new' }
format.xml { render :xml => @project.errors, :status => :unprocessable_entity }
end
end
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 46b68e4cc..b37fec57b 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -1,5 +1,5 @@
<div class="contextual">
-<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add' %>
+<%= link_to l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add' %>
</div>
<h2><%=l(:label_project_plural)%></h2>
diff --git a/app/views/projects/index.rhtml b/app/views/projects/index.rhtml
index a2ba1c389..2b506388a 100644
--- a/app/views/projects/index.rhtml
+++ b/app/views/projects/index.rhtml
@@ -3,7 +3,7 @@
<% end %>
<div class="contextual">
- <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
+ <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
<%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
<%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
<%= link_to l(:label_overall_activity), { :controller => 'activities', :action => 'index' }%>
diff --git a/app/views/projects/add.rhtml b/app/views/projects/new.html.erb
index c8a9c7600..c8a9c7600 100644
--- a/app/views/projects/add.rhtml
+++ b/app/views/projects/new.html.erb