jro_apps/redmine Commit - r4025:f219a92c1fa0

Merged r4069 from trunk....

Eric Davis -

r4025:f219a92c1fa0

parent child

Context file:

r4025:f219a92c1fa0

Collapse all files

app/controllers/projects_controller.rb +5 -6

               menu_item :roadmap, :only => :roadmap
               menu_item :settings, :only => :settings
-              before_filter :find_project, :except => [ :index, :list, :add, :create, :copy ]
+              before_filter :find_project, :except => [ :index, :list, :new, :create, :copy ]
-              before_filter :authorize, :except => [ :index, :list, :add, :create, :copy, :archive, :unarchive, :destroy]
+              before_filter :authorize, :except => [ :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy]
-              before_filter :authorize_global, :only => [:add, :create]
+              before_filter :authorize_global, :only => [:new, :create]
               before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy ]
               accept_key_auth :index
                 end
               end
-              # Add a new project
+              def new
-              def add
                 @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
                 @trackers = Tracker.all
                 @project = Project.new(params[:project])
                   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

app/views/admin/projects.rhtml +1 -1

             <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>

app/views/projects/index.rhtml +1 -1

             <% 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' }%>

app/views/projects/new.html.erb ~~app/views/projects/add.rhtml~~ renamed 0 0

NO CONTENT: file renamed from app/views/projects/add.rhtml to app/views/projects/new.html.erb

config/routes.rb +1 -1

                 projects.with_options :conditions => {:method => :get} do |project_views|
                   project_views.connect 'projects', :action => 'index'
                   project_views.connect 'projects.:format', :action => 'index'
-                  project_views.connect 'projects/new', :action => 'add'
+                  project_views.connect 'projects/new', :action => 'new'
                   project_views.connect 'projects/:id', :action => 'show'
                   project_views.connect 'projects/:id.:format', :action => 'show'
                   project_views.connect 'projects/:id/:action', :action => /destroy|settings/

lib/redmine.rb +2 -2

             Redmine::AccessControl.map do |map|
               map.permission :view_project, {:projects => [:show], :activities => [:index]}, :public => true
               map.permission :search_project, {:search => :index}, :public => true
-              map.permission :add_project, {:projects => [:add, :create]}, :require => :loggedin
+              map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
               map.permission :edit_project, {:projects => [:settings, :edit]}, :require => :member
               map.permission :select_project_modules, {:projects => :modules}, :require => :member
               map.permission :manage_members, {:projects => :settings, :members => [:new, :edit, :destroy, :autocomplete_for_member]}, :require => :member
               map.permission :manage_versions, {:projects => :settings, :versions => [:new, :edit, :close_completed, :destroy]}, :require => :member
-              map.permission :add_subprojects, {:projects => [:add, :create]}, :require => :member
+              map.permission :add_subprojects, {:projects => [:new, :create]}, :require => :member
               map.project_module :issue_tracking do |map|
                 # Issue categories

test/functional/projects_controller_test.rb +7 -7

                 end
               end
-              context "#add" do
+              context "#new" do
                 context "by admin user" do
                   setup do
                     @request.session[:user_id] = 1
                   end
                   should "accept get" do
-                    get :add
+                    get :new
                     assert_response :success
-                    assert_template 'add'
+                    assert_template 'new'
                   end
                 end
                   end
                   should "accept get" do
-                    get :add
+                    get :new
                     assert_response :success
-                    assert_template 'add'
+                    assert_template 'new'
                     assert_no_tag :select, :attributes => {:name => 'project[parent_id]'}
                   end
                 end
                   end
                   should "accept get" do
-                    get :add, :parent_id => 'ecookbook'
+                    get :new, :parent_id => 'ecookbook'
                     assert_response :success
-                    assert_template 'add'
+                    assert_template 'new'
                     # parent project selected
                     assert_tag :select, :attributes => {:name => 'project[parent_id]'},
                                         :child => {:tag => 'option', :attributes => {:value => '1', :selected => 'selected'}}

test/integration/routing_test.rb +1 -1

                 should_route :get, "/projects", :controller => 'projects', :action => 'index'
                 should_route :get, "/projects.atom", :controller => 'projects', :action => 'index', :format => 'atom'
                 should_route :get, "/projects.xml", :controller => 'projects', :action => 'index', :format => 'xml'
-                should_route :get, "/projects/new", :controller => 'projects', :action => 'add'
+                should_route :get, "/projects/new", :controller => 'projects', :action => 'new'
                 should_route :get, "/projects/test", :controller => 'projects', :action => 'show', :id => 'test'
                 should_route :get, "/projects/1.xml", :controller => 'projects', :action => 'show', :id => '1', :format => 'xml'
                 should_route :get, "/projects/4223/settings", :controller => 'projects', :action => 'settings', :id => '4223'

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages