01_bookmark_filters.patch - Redmine

         ungrouped = []
         grouped = {label_string: [], label_date: [], label_time_tracking: [], label_attachment: []}
         query.available_filters.map do |field, field_options|
           if /^cf_\d+\./.match?(field)
             group = (field_options[:through] || field_options[:field]).try(:name)
           elsif field =~ /^(.+)\./
             # association filters
             group = :"field_#{$1}"
           elsif field_options[:type] == :relation
             group = :label_relations
           elsif field_options[:type] == :tree
             group = query.is_a?(IssueQuery) ? :label_relations : nil
           elsif %w(member_of_group assigned_to_role).include?(field)
             group = :field_assigned_to
           elsif field_options[:type] == :date_past || field_options[:type] == :date
             group = :label_date
           elsif %w(estimated_hours spent_time).include?(field)
             group = :label_time_tracking
           elsif %w(attachment attachment_description).include?(field)
             group = :label_attachment
           elsif [:string, :text, :search].include?(field_options[:type])
             group = :label_string
           end
           if group
           if (group = group_for_filter(field, field_options, query))
             (grouped[group] ||= []) << [field_options[:name], field]
           else
             ungrouped << [field_options[:name], field]
-...
+        s
       end
       def group_for_filter(field, field_options, query)
         if /^cf_\d+\./.match?(field)
           (field_options[:through] || field_options[:field]).try(:name)
         elsif field =~ /^(.+)\./
           # association filters
           :"field_#{$1}"
         elsif field_options[:type] == :relation
           :label_relations
         elsif field_options[:type] == :tree
           query.is_a?(IssueQuery) ? :label_relations : nil
         elsif %w(member_of_group assigned_to_role).include?(field)
           :field_assigned_to
         elsif field_options[:type] == :date_past || field_options[:type] == :date
           :label_date
         elsif %w(estimated_hours spent_time).include?(field)
           :label_time_tracking
         elsif %w(attachment attachment_description).include?(field)
           :label_attachment
         elsif [:string, :text, :search].include?(field_options[:type])
           :label_string
         end
       end
       def query_filters_hidden_tags(query)
         tags = ''.html_safe
         query.filters.each do |field, options|
+    -

     .add-filter {width:35%; float:right; text-align: right; vertical-align: top;}
     select#bookmarked_filters {
       max-width: 100%;
+    }
     #issue_is_private_wrap {float:right; margin-right:1em;}
     .toggle-multiselect { margin-right:5px; cursor:pointer;}
     .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }

       layout :query_layout
       before_action :find_query, :only => [:edit, :update, :destroy]
       before_action :find_optional_project, :only => [:new, :create]
       before_action :find_optional_project, :only => [:new, :create, :save_bookmarked_filters]
       accept_api_auth :index
-...
         super unless query_layout == 'admin'
       end
       def save_bookmarked_filters
         respond_to do |format|
           format.js do
             @query = query_class.new
             @query.user = ::User.current
             @query.project = @project
             ::User.current.pref.save_bookmarked_query_filters(@query, params[:bookmarked_filters] || [])
           end
           format.any { render_404 }
         end
       end
       private
       def find_query

       def filters_options_for_select(query)
         ungrouped = []
         grouped = {label_string: [], label_date: [], label_time_tracking: [], label_attachment: []}
         query.available_filters.map do |field, field_options|
           if (group = group_for_filter(field, field_options, query))
             (grouped[group] ||= []) << [field_options[:name], field]
           else
             ungrouped << [field_options[:name], field]
         bookmarks = bookmarked_filters(query)
         query.available_filters.
           sort_by { |field, filter| sort_bookmarks(field, filter, bookmarks) }.
           map do |field, field_options|
             if bookmarks.include?(field)
               ungrouped << ["#{field_options[:name]}\u2b50", field]
             elsif (group = group_for_filter(field, field_options, query))
               (grouped[group] ||= []) << [field_options[:name], field]
             else
               ungrouped << [field_options[:name], field]
             end
           end
         end
         # Remove empty groups
         grouped.delete_if {|k, v| v.empty?}
         # Don't group dates if there's only one (eg. time entries filters)
-...
+        s
       end
       def bookmarked_filters(query)
         ::User.current.pref.bookmarked_query_filters(query.class)
       end
       ONE_ARRAY = [1].freeze
       def sort_bookmarks(field, filter, bookmarks)
         bookmarks.include?(field) ? [0, filter[:name].downcase] : ONE_ARRAY
       end
       def group_for_filter(field, field_options, query)
         if /^cf_\d+\./.match?(field)
           (field_options[:through] || field_options[:field]).try(:name)
-...
         tags
       end
       def bookmarked_filters_options(query)
         options_for_select(
           query.available_filters.map { |id, filter| [filter[:name], id] }.sort_by(&:first),
           selected_bookmarked_filters(query)
+        )
       end
       def selected_bookmarked_filters(query)
         query.available_filters.keys &
           User.current.pref.bookmarked_query_filters(query.class)
       end
       private :selected_bookmarked_filters
       def path_to_save_bookmarked_filters
         if @project
           save_bookmarked_filters_project_queries_path(@project)
         else
           save_bookmarked_filters_queries_path
         end
       end
       def query_columns_hidden_tags(query)
         tags = ''.html_safe
         query.columns.each do |column|

     import { Controller } from "@hotwired/stimulus";
     export default class extends Controller {
       static values = {
         url: String
+      }
       connect() {
         // Don't send select value on form submission
         this.element.removeAttribute('name')
+      }
       saveBookmarkedFilters(event) {
         const values = Array.from(event.target.selectedOptions).map(({ value }) => value);
         $.ajax({
           url: this.urlValue,
           type: 'post',
           data: {
             bookmarked_filters: values,
             ...event.params
+          }
         });
+      }
+    }

         my_page_settings.keep_if {|block, settings| blocks.include?(block)}
       end
       private :clear_unused_block_settings
       def bookmarked_query_filters(query_class)
         bookmarked_filters[query_class.to_s.underscore] || []
       end
       def save_bookmarked_query_filters(query, filter_names)
         query_filters = bookmarked_query_filters(query.class)
         old_selected_filters = query.available_filters.keys & query_filters
         deleted = old_selected_filters - filter_names
         added = filter_names - old_selected_filters
         self.bookmarked_filters = {query.class.to_s.underscore => query_filters - deleted + added}
         save!
       end
       def bookmarked_filters
         self[:bookmarked_filters] || {}
       end
       private :bookmarked_filters
       def bookmarked_filters=(value)
         self[:bookmarked_filters] = bookmarked_filters.merge!(value)
       end
       private :bookmarked_filters=
     end

           <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
         </div>
       </fieldset>
       <%= render partial: 'queries/bookmarked_filters', locals: {query: @query} %>
     </div>
     <span class="contextual pagination">

           </div>
         </div>
       </fieldset>
       <%= render partial: 'queries/bookmarked_filters', locals: {query: @query} %>
     </div>
     <p class="contextual">

     <fieldset id="bookmarked-filters" class="collapsible collapsed">
       <legend onclick="toggleFieldset(this);" class="icon icon-collapsed">
         <%= sprite_icon("angle-right", rtl: true) %>
         <%= t(:label_bookmarked_filters) %>
       </legend>
       <div class="hidden">
         <%= select_tag 'bookmarked_filters',
                        bookmarked_filters_options(query),
                        multiple: true,
                        data: {
                          controller: 'bookmarked-filters',
                          action: 'bookmarked-filters#saveBookmarkedFilters',
                          'bookmarked-filters-url-value': path_to_save_bookmarked_filters,
                          'bookmarked-filters-type-param': query.class.to_s
+                       }
         %>
       </div>
     </fieldset>

/dev/null → app/views/queries/_filter_select.html.erb
	1	<div class="add-filter">
	2	<%= label_tag('add_filter_select', l(:label_filter_add)) %>
	3	<%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %>
	4	</div>

     <div id="filters-table">
     </div>
     <div class="add-filter">
     <%= label_tag('add_filter_select', l(:label_filter_add)) %>
     <%= select_tag 'add_filter_select', filters_options_for_select(query), :name => nil %>
     </div>
     <%= render partial: 'queries/filter_select', locals: {query: @query} %>
     <%= hidden_field_tag 'f[]', '' %>
     <% include_calendar_headers_tags %>

           </div>
         </fieldset>
       <% end %>
       <%= render partial: 'queries/bookmarked_filters', locals: {query: @query} %>
     </div>
     <p class="buttons">

     $('.add-filter').replaceWith('<%=
       escape_javascript(render(partial: 'queries/filter_select', locals: {query: @query}))
     %>');
     $('#add_filter_select').change(function() {
       addFilter($(this).val(), '', []);
     });
     (function() {
       // Block already added filters in select
       const presentFilters = $('#filters-table .field input').map((_, filter) => filter.value);
       $('#add_filter_select').find('option').each(function () {
         if ($.inArray($(this).attr('value'), presentFilters) !== -1) {
           $(this).attr('disabled', true);
+        }
       });
     })();
     $('#ajax-indicator').hide();

config/locales/en.yml
807	807	label_my_queries: My custom queries
808	808	label_filter_add: Add filter
809	809	label_filter_plural: Filters
	810	label_bookmarked_filters: Bookmarked filters
810	811	label_equals: is
811	812	label_not_equals: is not
812	813	label_in_less_than: in less than

config/locales/ru.yml
440	440	label_board: ?????
441	441	label_board_new: ????? ?????
442	442	label_board_plural: ??????
	443	label_bookmarked_filters: ????????? ???????
443	444	label_boolean: ??????????
444	445	label_bulk_edit_selected_issues: ????????????? ??? ????????? ??????
445	446	label_calendar: ?????????

         resources :time_entries, :controller => 'timelog', :except => [:show, :edit, :update, :destroy] do
           get 'report', :on => :collection
         end
         resources :queries, :only => [:new, :create]
         resources :queries, :only => [:new, :create] do
           collection do
             post :save_bookmarked_filters
           end
         end
         shallow do
           resources :issue_categories
         end
-...
       post '/issues/new', :to => 'issues#new'
       match '/issues', :controller => 'issues', :action => 'destroy', :via => :delete
       resources :queries, :except => [:show]
       resources :queries, :except => [:show] do
         collection do
           post :save_bookmarked_filters
         end
       end
       get '/queries/filter', :to => 'queries#filter', :as => 'queries_filter'
       resources :news, :only => [:index, :show, :edit, :update, :destroy, :create, :new]

           # Permissions
           AccessControl.map do |map|
             map.permission :view_project, {:projects => [:show, :bookmark], :activities => [:index]}, :public => true, :read => true
             map.permission :view_project, {:projects => [:show, :bookmark],
                                            :activities => [:index],
                                            :queries => [:save_bookmarked_filters]},
                            :public => true,
                            :read => true
             map.permission :search_project, {:search => :index}, :public => true, :read => true
             map.permission :add_project, {:projects => [:new, :create]}, :require => :loggedin
             map.permission :edit_project, {:projects => [:settings, :edit, :update]}, :require => :member
-...
                                             :context_menus => [:issues],
                                             :versions => [:index, :show, :status_by],
                                             :journals => [:index, :diff],
                                             :queries => :index,
                                             :queries => [:index, :save_bookmarked_filters],
                                             :reports => [:issue_report, :issue_report_details]},
                              :read => true
               map.permission :add_issues, {:issues => [:new, :create], :attachments => :upload}
-...
             end
             map.project_module :time_tracking do |map|
               map.permission :view_time_entries, {:timelog => [:index, :report, :show]}, :read => true
               map.permission :view_time_entries, {:timelog => [:index, :report, :show],
                                                   :queries => [:save_bookmarked_filters]},
                              :read => true
               map.permission :log_time, {:timelog => [:new, :create]}, :require => :loggedin
               map.permission :edit_time_entries,
                              {:timelog => [:edit, :update, :destroy, :bulk_edit, :bulk_update]},
-...
             end
             map.project_module :calendar do |map|
               map.permission :view_calendar, {:calendars => [:show, :update]}, :read => true
               map.permission :view_calendar, {:calendars => [:show, :update],
                                               :queries => [:save_bookmarked_filters]},
                              :read => true
             end
             map.project_module :gantt do |map|
               map.permission :view_gantt, {:gantts => [:show, :update]}, :read => true
               map.permission :view_gantt, {:gantts => [:show, :update],
                                            :queries => [:save_bookmarked_filters]},
                              :read => true
             end
           end
+    -

Project

General

Profile

Redmine

Patch #43032 » 01_bookmark_filters.patch