jro_apps/redmine Commit - r4038:4593d97472c7

Merged r4093 from trunk....

Eric Davis -

r4038:4593d97472c7

parent child

Context file:

r4038:4593d97472c7

Collapse all files

app/views/issues/index.rhtml +1 0

             <div class="contextual">
             <% if !@query.new_record? && @query.editable_by?(User.current) %>
             	<%= link_to l(:button_edit), {:controller => 'queries', :action => 'edit', :id => @query}, :class => 'icon icon-edit' %>
             	<%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
             <% end %>
             </div>
             <h2><%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %></h2>
             <% html_title(@query.new_record? ? l(:label_issue_plural) : @query.name) %>
             <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
                 <%= hidden_field_tag('project_id', @project.to_param) if @project %>
             		<div id="query_form_content" class="hide-when-print">
                 <fieldset id="filters" class="collapsible <%= @query.new_record? ? "" : "collapsed" %>">
                 	<legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
                 	<div style="<%= @query.new_record? ? "" : "display: none;" %>">
                 		<%= render :partial => 'queries/filters', :locals => {:query => @query} %>
                 	</div>
                 </fieldset>
                 <fieldset class="collapsible collapsed">
                 	<legend onclick="toggleFieldset(this);"><%= l(:label_options) %></legend>
                 	<div style="display: none;">
                 		<table>
                 			<tr>
                 				<td><%= l(:field_column_names) %></td>
             						<td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td>
             					</tr>
             					<tr>
             						<td><%= l(:field_group_by) %></td>
             						<td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %></td>
             					</tr>
             				</table>
             			</div>
             		</fieldset>
             		</div>
                 <p class="buttons hide-when-print">
                 <%= link_to_remote l(:button_apply),
                                    { :url => { :set_filter => 1 },
                                      :before => 'selectAllOptions("selected_columns");',
                                      :update => "content",
+                                     :complete => "apply_filters_observer()",
                                      :with => "Form.serialize('query_form')"
                                    }, :class => 'icon icon-checked' %>
                 <%= link_to_remote l(:button_clear),
                                    { :url => { :set_filter => 1, :project_id => @project },
                                      :method => :get,
                                      :update => "content",
                                    }, :class => 'icon icon-reload'  %>
                 <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
                 <%= link_to l(:button_save), {}, :onclick => "selectAllOptions('selected_columns'); $('query_form').submit(); return false;", :class => 'icon icon-save' %>
                 <% end %>
                 </p>
             <% end %>
             <%= error_messages_for 'query' %>
             <% if @query.valid? %>
             <% if @issues.empty? %>
             <p class="nodata"><%= l(:label_no_data) %></p>
             <% else %>
             <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
             <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
             <% end %>
             <% other_formats_links do |f| %>
             	<%= f.link_to 'Atom', :url => { :project_id => @project, :query_id => (@query.new_record? ? nil : @query), :key => User.current.rss_key } %>
             	<%= f.link_to 'CSV', :url => { :project_id => @project } %>
             	<%= f.link_to 'PDF', :url => { :project_id => @project } %>
             <% end %>
             <% end %>
             <%= call_hook(:view_issues_index_bottom, { :issues => @issues, :project => @project, :query => @query }) %>
             <% content_for :sidebar do %>
                 <%= render :partial => 'issues/sidebar' %>
             <% end %>
             <% content_for :header_tags do %>
                 <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
                 <%= auto_discovery_link_tag(:atom, {:controller => 'journals', :action => 'index', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
             <% end %>
             <%= context_menu issues_context_menu_path %>

app/views/queries/_filters.rhtml +12 0

             <script type="text/javascript">
             //<![CDATA[
             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);
                 if (check_box.checked) {
                     Element.show("operators_" + field);
                     toggle_operator(field);
                 } else {
                     Element.hide("operators_" + field);
                     Element.hide("div_values_" + field);
               }
             }
             function toggle_operator(field) {
               operator = $("operators_" + field);
               switch (operator.value) {
                 case "!*":
                 case "*":
                 case "t":
                 case "w":
                 case "o":
                 case "c":
                   Element.hide("div_values_" + field);
                   break;
                 default:
                   Element.show("div_values_" + field);
                   break;
               }
             }
             function toggle_multi_select(field) {
                 select = $('values_' + field);
                 if (select.multiple == true) {
                     select.multiple = false;
                 } else {
                     select.multiple = true;
                 }
             }
+            function apply_filters_observer() {
+              $$("#query_form input[type=text]").invoke("observe", "keypress", function(e){
+                if(e.keyCode == Event.KEY_RETURN) {
+                  <%= remote_function(:url => { :set_filter => 1},
+                                      :update => "content",
+                                      :with => "Form.serialize('query_form')",
+                                      :complete => "e.stop(); apply_filters_observer()") %>
+                }
+              });
+            }
+            Event.observe(document,"dom:loaded", apply_filters_observer);
             //]]>
             </script>
             <table width="100%">
             <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 <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
                 <td style="width:200px;">
                     <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
                     <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
                 </td>
                 <td style="width:150px;">
                     <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
                 </td>
                 <td>
                 <div id="div_values_<%= field %>" style="display:none;">
                 <% case options[:type]
                 when :list, :list_optional, :list_status, :list_subprojects %>
                     <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 image_tag('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %>
                 <% when :date, :date_past %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
                 <% when :string, :text %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 30, :class => "select-small" %>
                 <% when :integer %>
                     <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %>
                 <% end %>
                 </div>
                 <script type="text/javascript">toggle_filter('<%= field %>');</script>
                 </td>
                 </tr>
             <% end %>
             </table>
             </td>
             <td class="add-filter">
             <%= label_tag('add_filter_select', l(:label_filter_add)) %>:
             <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || 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",
             																		:name => nil %>
             </td>
             </tr>
             </table>

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