jro_apps/redmine Commit - r10000:e06bf0c46418

Don't show the project dropdown when logging time on an issue....

Jean-Philippe Lang -

r10000:e06bf0c46418

parent child

Context file:

r10000:e06bf0c46418

Collapse all files

app/views/timelog/_form.html.erb +1 -1

             <div class="box tabular">
             	<% if @time_entry.new_record? %>
-            	  <% if params[:project_id] %>
+            	  <% if params[:project_id] || @time_entry.issue %>
             	    <%= f.hidden_field :project_id %>
             	  <% else %>
             	    <p><%= f.select :project_id, project_tree_options_for_select(Project.allowed_to(:log_time).all, :selected => @time_entry.project), :required => true %></p>

test/functional/timelog_controller_test.rb +26 -12

                 @response   = ActionController::TestResponse.new
               end
-              def test_get_new
+              def test_new_with_project_id
                 @request.session[:user_id] = 3
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
-                # Default activity selected
+                assert_select 'select[name=?]', 'time_entry[project_id]', 0
-                assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
+                assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
-                                             :content => 'Development'
-                assert_select 'input[name=project_id][value=1]'
               end
-              def test_get_new_should_only_show_active_time_entry_activities
+              def test_new_with_issue_id
                 @request.session[:user_id] = 3
-                get :new, :project_id => 1
+                get :new, :issue_id => 2
                 assert_response :success
                 assert_template 'new'
-                assert_no_tag 'select', :attributes => {:name => 'time_entry[project_id]'}
+                assert_select 'select[name=?]', 'time_entry[project_id]', 0
-                assert_no_tag 'option', :content => 'Inactive Activity'
+                assert_select 'input[name=?][value=1][type=hidden]', 'time_entry[project_id]'
               end
               def test_new_without_project
                 get :new
                 assert_response :success
                 assert_template 'new'
-                assert_tag 'select', :attributes => {:name => 'time_entry[project_id]'}
+                assert_select 'select[name=?]', 'time_entry[project_id]'
-                assert_select 'input[name=project_id]', 0
+                assert_select 'input[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_without_project_should_prefill_the_form
                 assert_select 'select[name=?]', 'time_entry[project_id]' do
                   assert_select 'option[value=1][selected=selected]'
                 end
-                assert_select 'input[name=project_id]', 0
+                assert_select 'input[name=?]', 'time_entry[project_id]', 0
               end
               def test_new_without_project_should_deny_without_permission
                 assert_response 403
               end
+              def test_new_should_select_default_activity
+                @request.session[:user_id] = 3
+                get :new, :project_id => 1
+                assert_response :success
+                assert_select 'select[name=?]', 'time_entry[activity_id]' do
+                  assert_select 'option[selected=selected]', :text => 'Development'
+                end
+              end
+              def test_new_should_only_show_active_time_entry_activities
+                @request.session[:user_id] = 3
+                get :new, :project_id => 1
+                assert_response :success
+                assert_no_tag 'option', :content => 'Inactive Activity'
+              end
               def test_get_edit_existing_time
                 @request.session[:user_id] = 2
                 get :edit, :id => 2, :project_id => nil

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