28033-v2.patch - Redmine

Defect #28033 » 28033-v2.patch

Go MAEDA, 2023-04-09 06:17

     class QueriesController < ApplicationController
       menu_item :issues
       before_action :find_query, :only => [:edit, :update, :destroy]
       before_action :find_optional_project, :only => [:new, :create]
       before_action :find_optional_project, :only => [:new, :create, :edit, :update]
       accept_api_auth :index
-...
       end
       def update_query_from_params
         @query.project = params[:query_is_for_all] ? nil : @project
         @query.project = (params[:query] && params[:query][:project_id].present?) ? Project.find(params[:query][:project_id]) : nil
         @query.build_from_params(params)
         @query.column_names = nil if params[:default_columns]
         @query.sort_criteria = (params[:query] && params[:query][:sort_criteria]) || @query.sort_criteria

                              :class => 'icon icon-save' %>
       <% end %>
       <% if !@query.new_record? && @query.editable_by?(User.current) %>
         <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :calendar => 1), :class => 'icon icon-edit' %>
         <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :calendar => 1, :project_id => @project&.identifier), :class => 'icon icon-edit' %>
         <%= delete_link query_path(@query, :calendar => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
       <% end %>
     </p>

                              :class => 'icon icon-save' %>
       <% end %>
     <% if !@query.new_record? && @query.editable_by?(User.current) %>
       <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :gantt => 1), :class => 'icon icon-edit' %>
       <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, :gantt => 1, :project_id => @project&.identifier), :class => 'icon icon-edit' %>
       <%= delete_link query_path(@query, :gantt => 1), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
     <% end %>
     </p>

     <% end %>
     <% unless @query.type == 'ProjectQuery' %>
       <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
       <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?, :class => (User.current.admin? ? '' : 'disable-unless-private') %></p>
       <p><label><%=l(:field_project)%></label>
         <%= radio_button_tag 'query[project_id]', '', @query.project.nil?, id: nil, class: ('disable-unless-private' unless User.current.admin?) %> <%= l(:field_is_for_all) %>
       <% if @project %>
         <%= radio_button_tag 'query[project_id]', @project.identifier, !@query.project.nil?, id: nil %> <%= @project.name %>
       <% end%>
       </p>
     <% end %>
     <% unless params[:calendar] %>
-...
         var roles_checked = $('#query_visibility_1').is(':checked');
         var private_checked = $('#query_visibility_0').is(':checked');
         $("input[name='query[role_ids][]'][type=checkbox]").attr('disabled', !roles_checked);
         if (!private_checked) $("input.disable-unless-private").attr('checked', false);
         $("input.disable-unless-private").attr('disabled', !private_checked);
         if($("input.disable-unless-private").length){
           if (!private_checked) $("input[name='query[project_id]']:not([value=''])").prop('checked', true);
           $("input.disable-unless-private").attr('disabled', !private_checked);
+        }
       }).trigger('change');
     });

       <% else %>
         <% if @query.editable_by?(User.current) %>
           <% redirect_params = (controller_name == 'admin' && action_name == 'projects') ? {:admin_projects => 1} : {} %>
           <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, redirect_params), :class => 'icon icon-edit' %>
           <%= link_to l(:button_edit_object, object_name: l(:label_query).downcase), edit_query_path(@query, redirect_params.merge(project_id: @project&.identifier)), :class => 'icon icon-edit' %>
           <%= delete_link query_path(@query, redirect_params), {}, l(:button_delete_object, object_name: l(:label_query).downcase) %>
         <% end %>
       <% end %>

app/views/queries/edit.html.erb
1	1	<h2><%= l(:label_query) %></h2>
2	2
3		<%= form_tag(query_path(@query), :method => :put, :id => "query-form") do %>
	3	<%= form_tag(query_path(@query, project_id: @project&.identifier), :method => :put, :id => "query-form") do %>
4	4	<%= render :partial => 'form', :locals => {:query => @query} %>
5	5	<%= submit_tag l(:button_save) %>
6	6	<% end %>

         assert_response :success
         assert_select 'input[name=?][value="0"][checked=checked]', 'query[visibility]'
         assert_select 'input[name=query_is_for_all][type=checkbox]:not([checked]):not([disabled])'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 2 do
           assert_select '[value=""][class="disable-unless-private"]:not([checked])'
           assert_select '[value="ecookbook"][checked]'
         end
         assert_select 'select[name=?]', 'c[]' do
           assert_select 'option[value=tracker]'
           assert_select 'option[value=subject]'
-...
         assert_response :success
         assert_select 'input[name=?]', 'query[visibility]', 0
         assert_select 'input[name=query_is_for_all][type=checkbox][checked]:not([disabled])'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 1 do
           assert_select '[value=""][class="disable-unless-private"][checked]'
         end
       end
       def test_new_on_invalid_project
-...
         get(:new, :params => {:project_id => 1, :type => 'TimeEntryQuery'})
         assert_response :success
         assert_select 'input[name=type][value=?]', 'TimeEntryQuery'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 2 do
           assert_select '[value=""][class="disable-unless-private"]:not([checked])'
           assert_select '[value="ecookbook"][checked]'
         end
         assert_select 'p[class=?]', 'totable_columns', 1
         assert_select 'p[class=?]', 'block_columns', 0
       end
-...
         get(:new, :params => {:type => 'ProjectQuery'})
         assert_response :success
         assert_select 'input[name=type][value=?]', 'ProjectQuery'
         assert_select 'input[name=?]', 'query[project_id]', 0
       end
       def test_new_project_query_should_not_render_roles_visibility_options
-...
         assert_select 'input[id=?]', 'query_visibility_1', 0
       end
       def test_new_project_query_should_not_render_for_all_projects_option
         @request.session[:user_id] = 1
         get(:new, :params => {:type => 'ProjectQuery'})
         assert_response :success
         assert_select 'input[name=?]', 'for_all_projects', 0
       end
       def test_new_time_entry_query_should_select_spent_time_from_main_menu
         @request.session[:user_id] = 2
         get(
-...
         assert_select 'fieldset#filters'
         assert_select 'fieldset legend', {:text => 'Sort', :count => 0}
         assert_select 'fieldset#columns'
         assert_select 'input[name=?]', 'query[project_id]'
       end
       def test_new_with_calendar_params
-...
         assert_select 'fieldset#filters'
         assert_select 'fieldset legend', {:text => 'Sort', :count => 0}
         assert_select 'fieldset#columns', :count => 0
         assert_select 'input[name=?]', 'query[project_id]'
       end
       def test_new_without_gantt_and_calendar_params
-...
               "assigned_to_id" => ["1"], "status_id" => ["1"]
             },
             :query => {
               "name" => "test_new_project_public_query", "visibility" => "2"
               "name" => "test_new_project_public_query", "visibility" => "2", "project_id" => "ecookbook"
+            }
+          }
+        )
-...
             :query => {
               "name" => "test_create_project_roles_query",
               "visibility" => "1",
               "role_ids" => ["1", "2", ""]
               "role_ids" => ["1", "2", ""],
               "project_id" => "ecookbook"
+            }
+          }
+        )
-...
             :params => {
               :project_id => 'ecookbook',
               :query => {
                 "name" => "name", "visibility" => "2"
                 "name" => "name", "visibility" => "2", "project_id" => "ecookbook"
+              }
+            }
+          )
-...
             :create,
             :params => {
               :project_id => 'ecookbook',
               :query_is_for_all => '1',
               :query => {
                 "name" => "name", "visibility" => "2"
                 "name" => "name", "visibility" => "2", "project_id" => ""
+              }
+            }
+          )
-...
             :params => {
               :project_id => 'ecookbook',
               :query => {
                 "name" => "name", "visibility" => "2"
                 "name" => "name", "visibility" => "2", "project_id" => "ecookbook"
+              }
+            }
+          )
-...
             :create,
             :params => {
               :project_id => 'ecookbook',
               :query_is_for_all => '1',
               :query => {
                 "name" => "name", "visibility" => "2"
                 "name" => "name", "visibility" => "2", "project_id" => ""
+              }
+            }
+          )
-...
             :create,
             :params => {
               :project_id => 'ecookbook',
               :query_is_for_all => '1',
               :query => {
                 "name" => "name", "visibility" => "2"
                 "name" => "name", "visibility" => "2", "project_id" => ""
+              }
+            }
+          )
-...
                 "spent_on" => ["2016-07-14"]
               },
               :query => {
                 "name" => "test_new_project_public_query", "visibility" => "2"
                 "name" => "test_new_project_public_query", "visibility" => "2", "project_id" => "ecookbook"
+              }
+            }
+          )
-...
         assert_response :success
         assert_select 'input[name=?][value="2"][checked=checked]', 'query[visibility]'
         assert_select 'input[name=query_is_for_all][type=checkbox][checked=checked]'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 1 do
           assert_select '[value=""][checked]:not([class="disable-unless-private"])'
         end
       end
       def test_edit_global_private_query
-...
         assert_response :success
         assert_select 'input[name=?]', 'query[visibility]', 0
         assert_select 'input[name=query_is_for_all][type=checkbox][checked=checked]'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 1 do
           assert_select '[value=""][class="disable-unless-private"][checked]'
         end
       end
       def test_edit_project_private_query
         @request.session[:user_id] = 3
         get(:edit, :params => {:id => 2})
         get(:edit, :params => {:id => 2, :project_id => 'ecookbook'})
         assert_response :success
         assert_select 'input[name=?]', 'query[visibility]', 0
         assert_select 'input[name=query_is_for_all][type=checkbox]:not([checked])'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 2 do
           assert_select '[value=""][class="disable-unless-private"]:not([checked])'
           assert_select '[value="ecookbook"][checked]'
         end
       end
       def test_edit_project_public_query
         @request.session[:user_id] = 2
         get(:edit, :params => {:id => 1})
         get(:edit, :params => {:id => 1, :project_id => 'ecookbook'})
         assert_response :success
         assert_select 'input[name=?][value="2"][checked=checked]', 'query[visibility]'
         assert_select 'input[name=query_is_for_all][type=checkbox]:not([checked])'
         assert_select 'input[name=?][type=radio]', 'query[project_id]', 2 do
           assert_select '[value=""][class="disable-unless-private"]:not([checked])'
           assert_select '[value="ecookbook"][checked]'
         end
       end
       def test_edit_sort_criteria
-...
               "assigned_to_id" => ["me"], "status_id" => ["1"]
             },
             :query => {
               "name" => "test_edit_global_private_query", "visibility" => "2"
               "name" => "test_edit_global_private_query", "visibility" => "2", "project_id" => ""
+            }
+          }
+        )
-...
         q = Query.find_by_name('test_edit_global_private_query')
         assert !q.is_public?
         assert q.has_default_columns?
         assert_nil q.project
         assert q.valid?
       end
-...
               "assigned_to_id" => ["1"], "status_id" => ["1"]
             },
             :query => {
               "name" => "test_edit_global_public_query", "visibility" => "2"
               "name" => "test_edit_global_public_query", "visibility" => "2", "project_id" => ""
+            }
+          }
+        )
-...
         q = Query.find_by_name('test_edit_global_public_query')
         assert q.is_public?
         assert q.has_default_columns?
         assert_nil q.project
         assert q.valid?
       end
       def test_update_global_private_query_when_change_global_to_project_should_set_project
         assert_nil Query.find_by_name('test_edit_global_private_query')
         @request.session[:user_id] = 3
         put(
           :update,
           :params => {
             :id => 3,
             :project_id => 'ecookbook',
             :query => {
               "name" => "test_edit_global_private_query", "visibility" => "0", "project_id" => "ecookbook"
+            }
+          }
+        )
         assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => 3
         q = Query.find_by_name('test_edit_global_private_query')
         assert !q.is_global?
         assert q.project
       end
       def test_update_project_private_query_when_change_project_to_global_should_not_set_project
         assert_nil Query.find_by_name('test_edit_project_private_query')
         @request.session[:user_id] = 3
         put(
           :update,
           :params => {
             :id => 2,
             :project_id => 'ecookbook',
             :query => {
               "name" => "test_edit_project_private_query", "visibility" => "0", "project_id" => ""
+            }
+          }
+        )
         assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => 2
         q = Query.find_by_name('test_edit_project_private_query')
         assert q.is_global?
         assert_nil q.project
       end
       def test_update_admin_projects_query
         q = ProjectQuery.create(:name => 'project_query')
         @request.session[:user_id] = 1

« Previous
1
2
3
4
Next »

(4-4/4)

Project

General

Profile

Redmine

Defect #28033 » 28033-v2.patch