diff options
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/issues/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/queries/_columns.html.erb | 4 | ||||
| -rw-r--r-- | app/views/queries/_form.html.erb | 2 | ||||
| -rw-r--r-- | app/views/settings/_issues.html.erb | 8 | ||||
| -rw-r--r-- | app/views/timelog/_date_range.html.erb | 2 |
5 files changed, 8 insertions, 10 deletions
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 864c7d554..0e4f940b2 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -24,7 +24,7 @@ <table> <tr> <td><%= l(:field_column_names) %></td> - <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td> + <td><%= render_query_columns_selection(@query) %></td> </tr> <tr> <td><label for='group_by'><%= l(:field_group_by) %></label></td> diff --git a/app/views/queries/_columns.html.erb b/app/views/queries/_columns.html.erb index f359c1615..0d624d989 100644 --- a/app/views/queries/_columns.html.erb +++ b/app/views/queries/_columns.html.erb @@ -17,10 +17,10 @@ <td> <%= label_tag "selected_columns", l(:description_selected_columns) %> <br /> - <%= select_tag((defined?(tag_name) ? tag_name : 'c[]'), + <%= select_tag tag_name, options_for_select(query_selected_inline_columns_options(query)), :id => 'selected_columns', :multiple => true, :size => 10, :style => "width:150px", - :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);") %> + :ondblclick => "moveOptions(this.form.selected_columns, this.form.available_columns);" %> </td> <td class="buttons"> <input type="button" value="↑" onclick="moveOptionUp(this.form.selected_columns);" /><br /> diff --git a/app/views/queries/_form.html.erb b/app/views/queries/_form.html.erb index 32f6aab27..12244eb70 100644 --- a/app/views/queries/_form.html.erb +++ b/app/views/queries/_form.html.erb @@ -49,7 +49,7 @@ <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %> <legend><%= l(:field_column_names) %></legend> -<%= render :partial => 'queries/columns', :locals => {:query => query}%> +<%= render render_query_columns_selection(query) %> <% end %> </div> diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb index 7b0d96fa3..2efc6e8c2 100644 --- a/app/views/settings/_issues.html.erb +++ b/app/views/settings/_issues.html.erb @@ -22,11 +22,9 @@ <fieldset class="box"> <legend><%= l(:setting_issue_list_default_columns) %></legend> - <%= render :partial => 'queries/columns', - :locals => { - :query => IssueQuery.new(:column_names => Setting.issue_list_default_columns), - :tag_name => 'settings[issue_list_default_columns][]' - } %> + <%= render_query_columns_selection( + IssueQuery.new(:column_names => Setting.issue_list_default_columns), + :name => 'settings[issue_list_default_columns]') %> </fieldset> <%= submit_tag l(:button_save) %> diff --git a/app/views/timelog/_date_range.html.erb b/app/views/timelog/_date_range.html.erb index 295be910e..a889f160c 100644 --- a/app/views/timelog/_date_range.html.erb +++ b/app/views/timelog/_date_range.html.erb @@ -11,7 +11,7 @@ <table> <tr> <td><%= l(:field_column_names) %></td> - <td><%= render :partial => 'queries/columns', :locals => {:query => @query} %></td> + <td><%= render_query_columns_selection(@query) %></td> </tr> </table> </div> |