jro_apps/redmine Commit - r77:638ce18d4a0a

filters replaced on issues list...

Jean-Philippe Lang -

r77:638ce18d4a0a

parent child

Context file:

r77:638ce18d4a0a

Collapse all files

queries/trunk/public/images/expand.png created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

queries/trunk/app/controllers/projects_controller.rb +13 -8

                 sort_init 'issues.id', 'desc'
                 sort_update
-                @query = Query.new
+                session[:query] = nil if params[:set_filter]
-                params[:fields].each do |field|
+                @query = session[:query] || Query.new
-                  @query.add_filter(field, params[:operators][field], params[:values][field])
+                if params[:fields] and params[:fields].is_a? Array
-                end if params[:fields]
+                  @query.filters = {}
+                  params[:fields].each do |field|
+                    @query.add_filter(field, params[:operators][field], params[:values][field])
+                  end
+                end
+                session[:query] = @query
                 @results_per_page_options = [ 15, 25, 50, 100 ]
                 if params[:per_page] and @results_per_page_options.include? params[:per_page].to_i
                 sort_init 'issues.id', 'desc'
                 sort_update
-                search_filter_init_list_issues
+                @query = session[:query] || Query.new
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
-            						:conditions => search_filter_clause
+            						:conditions => @query.statement
                 ic = Iconv.new('ISO-8859-1', 'UTF-8')
                 export = StringIO.new
                 sort_init 'issues.id', 'desc'
                 sort_update
-                search_filter_init_list_issues
+                @query = session[:query] || Query.new
                 @issues =  Issue.find :all, :order => sort_clause,
             						:include => [ :author, :status, :tracker, :project, :custom_values ],
-            						:conditions => search_filter_clause
+            						:conditions => @query.statement
                 @options_for_rfpdf ||= {}
                 @options_for_rfpdf[:file_name] = "export.pdf"

queries/trunk/app/models/query.rb +2 -2

             class Query < ActiveRecord::Base
               serialize :filters
-              validates_presence_of :name
+              validates_presence_of :name, :on => :save
               @@operators = { "="   => "Egal",
                               "!"   => "Different",
               def add_filter(field, operator, values)
                 # values must be an array
-                return unless values and values.is_a? Array
+                return unless values and values.is_a? Array # and !values.first.empty?
                 # check if field is defined as an available filter
                 if @@available_filters.has_key? field
                   filter_options = @@available_filters[field]

queries/trunk/app/views/projects/list_issues.rhtml +10 -2

             </small>
             </div>
-            <div>
             <%= start_form_tag :action => 'list_issues' %>
             <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
+            <table width="100%">
+            <tr>
+            <td align="right">
             <%= submit_tag l(:button_apply), :class => "button-small" %>
             <%= end_form_tag %>
-            </div>
+            <%= start_form_tag :action => 'list_issues', :set_filter => 1 %>
+            <%= submit_tag l(:button_clear), :class => "button-small" %>
+            <%= end_form_tag %>
+            </td>
+            </tr>
+            </table>
              &nbsp;
             <table class="listTableContent">
                 <tr>

queries/trunk/app/views/queries/_filters.rhtml +29 -3

             <script>
+            function add_filter() {
+                select = $('add_filter_select');
+                field = select.value
+                Element.show('tr_' +  field);
+                check_box = $('cb_' + field);
+                check_box.checked = true;
+                toggle_filter(field);
+                select.selectedIndex = 0;
+                for (i=0; i<select.options.length; i++) {
+                    if (select.options[i].value == field) {
+                        select.options[i].disabled = true;
+                    }
+                }
+            }
             function toggle_filter(field) {
                 check_box = $('cb_' + field);
             </script>
-            <fieldset><legend>Filtres</legend>
+            <fieldset style="margin:0;"><legend>Filtres</legend>
+            <table width="100%" cellpadding=0 cellspacing=0>
+            <tr>
+            <td>
             <table>
             <% Query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
                 <% field = filter[0]
                    options = filter[1] %>
-                <tr>
+                <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
                 <td valign="top" width="200">
                     <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
                     <label for="cb_<%= field %>"><%= l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
                     <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %>" name="values[<%= field %>][]" id="values[<%= field %>][]" class="select-small" style="vertical-align: top;">
                     <%= options_for_select options[:values], query.values_for(field) %>
                     </select>
-                    <%= link_to_function '+', "toggle_multi_select('#{field}');" %>
+                    <%= link_to_function image_tag('expand'), "toggle_multi_select('#{field}');" %>
                 <% when :date, :date_past %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :size => 3, :class => "select-small" %> jours
                 <% end %>
                 <script>toggle_filter('<%= field %>');</script>
             <% end %>
             </table>
+            </td>
+            <td align="right" valign="top">
+            Add filter:
+            <%= select_tag 'add_filter_select', options_for_select([["",""]] + Query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
+            </td>
+            </tr>
+            </table>
             </fieldset>

queries/trunk/public/stylesheets/application.css +1 -1

             table.listTableContent {
             	border:1px solid #578bb8;
-            	width:99%;
+            	width:100%;
             	border-collapse: collapse;
             }

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