jro_apps/redmine Commit - r773:514cdacc87e6

Custom query columns: checkboxes replaced by two selects that let the user specify columns order....

Jean-Philippe Lang -

r773:514cdacc87e6

parent child

Context file:

r773:514cdacc87e6

Collapse all files

public/javascripts/select_list_move.js created 644 +55 0

@@ -0,0 +1,55
	1	var NS4 = (navigator.appName == "Netscape" && parseInt(navigator.appVersion) < 5);
	2
	3	function addOption(theSel, theText, theValue)
	4	{
	5	var newOpt = new Option(theText, theValue);
	6	var selLength = theSel.length;
	7	theSel.options[selLength] = newOpt;
	8	}
	9
	10	function deleteOption(theSel, theIndex)
	11	{
	12	var selLength = theSel.length;
	13	if(selLength>0)
	14	{
	15	theSel.options[theIndex] = null;
	16	}
	17	}
	18
	19	function moveOptions(theSelFrom, theSelTo)
	20	{
	21
	22	var selLength = theSelFrom.length;
	23	var selectedText = new Array();
	24	var selectedValues = new Array();
	25	var selectedCount = 0;
	26
	27	var i;
	28
	29	for(i=selLength-1; i>=0; i--)
	30	{
	31	if(theSelFrom.options[i].selected)
	32	{
	33	selectedText[selectedCount] = theSelFrom.options[i].text;
	34	selectedValues[selectedCount] = theSelFrom.options[i].value;
	35	deleteOption(theSelFrom, i);
	36	selectedCount++;
	37	}
	38	}
	39
	40	for(i=selectedCount-1; i>=0; i--)
	41	{
	42	addOption(theSelTo, selectedText[i], selectedValues[i]);
	43	}
	44
	45	if(NS4) history.go(0);
	46	}
	47
	48	function selectAllOptions(id)
	49	{
	50	var select = $(id);
	51	for (var i=0; i<select.options.length; i++) {
	52	select.options[i].selected = true;
	53	}
	54	}
	55

app/controllers/issues_controller.rb +1 -1

                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, 25, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
-                                       :include => [ :assigned_to, :status, :tracker, :project, :priority ],
+                                       :include => [ :assigned_to, :status, :tracker, :project, :priority, :category ],
                                        :conditions => @query.statement,
                                        :limit  =>  @issue_pages.items_per_page,
                                        :offset =>  @issue_pages.current.offset

app/controllers/projects_controller.rb +1 -1

                   @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
                   @issue_pages = Paginator.new self, @issue_count, @results_per_page, params['page']
                   @issues = Issue.find :all, :order => sort_clause,
-              						:include => [ :assigned_to, :status, :tracker, :project, :priority ],
+              						:include => [ :assigned_to, :status, :tracker, :project, :priority, :category ],
               						:conditions => @query.statement,
               						:limit  =>  @issue_pages.items_per_page,
               						:offset =>  @issue_pages.current.offset

app/models/query.rb +2 -1

                 if has_default_columns?
                   available_columns.select {|c| c.default? }
                 else
-                  available_columns.select {|c| column_names.include?(c.name) }
+                  # preserve the column_names order
+                  column_names.collect {|name| available_columns.find {|col| col.name == name}}.compact
                 end
               end

app/views/queries/_columns.rhtml +23 -3

@@ -1,7 +1,27
1	<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>	1	<% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
2	<legend><%= l(:field_column_names) %></legend>	2	<legend><%= l(:field_column_names) %></legend>
3	<% query.available_columns.each do \|column\| %>	3
4	<label><%= check_box_tag 'query[column_names][]', column.name, query.has_column?(column) %> <%= l("field_#{column.name}") %></label><br />
5	<% end %>
6	<%= hidden_field_tag 'query[column_names][]', '' %>	4	<%= hidden_field_tag 'query[column_names][]', '' %>
		5	<table margin=0>
		6	<tr>
		7	<td><%= select_tag 'available_columns',
		8	options_for_select((query.available_columns - query.columns).collect {\|column\| [l("field_#{column.name}"), column.name]}),
		9	:multiple => true, :size => 10, :style => "width:150px" %>
		10	</td>
		11	<td align="center" valign="middle">
		12	<input type="button" value="-->"
		13	onclick="moveOptions(this.form.available_columns, this.form.selected_columns);" /><br />
		14	<input type="button" value="<--"
		15	onclick="moveOptions(this.form.selected_columns, this.form.available_columns);" />
		16	</td>
		17	<td><%= select_tag 'query[column_names][]',
		18	options_for_select(@query.columns.collect {\|column\| [l("field_#{column.name}"), column.name]}),
		19	:id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px" %>
		20	</td>
		21	</tr>
		22	</table>
		23	<% end %>
		24
		25	<% content_for :header_tags do %>
		26	<%= javascript_include_tag 'select_list_move' %>
7	<% end %>	27	<% end %>

app/views/queries/_form.rhtml +2 -2

             <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
             <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
-                  :onchange => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
+                  :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
             </div>
-            <%= render :partial => 'queries/columns', :locals => {:query => query}%>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
+            <%= render :partial => 'queries/columns', :locals => {:query => query}%>
             </div>

app/views/queries/edit.rhtml +1 -1

             <h2><%= l(:label_query) %></h2>
-            <% form_tag({:action => 'edit', :id => @query}) do %>
+            <% form_tag({:action => 'edit', :id => @query}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
               <%= render :partial => 'form', :locals => {:query => @query} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

app/views/queries/new.rhtml +1 -1

             <h2><%= l(:label_query_new) %></h2>
-            <% form_tag({:action => 'new', :project_id => @query.project}) do %>
+            <% form_tag({:action => 'new', :project_id => @query.project}, :onsubmit => 'selectAllOptions("selected_columns");') do %>
               <%= render :partial => 'form', :locals => {:query => @query} %>
               <%= submit_tag l(:button_save) %>
             <% end %>

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