diff --git a/queries/trunk/app/controllers/projects_controller.rb b/queries/trunk/app/controllers/projects_controller.rb index 92025921d..8dcb0677c 100644 --- a/queries/trunk/app/controllers/projects_controller.rb +++ b/queries/trunk/app/controllers/projects_controller.rb @@ -208,15 +208,27 @@ class ProjectsController < ApplicationController sort_init 'issues.id', 'desc' sort_update - session[:query] = nil if params[:set_filter] - @query = session[:query] || Query.new - if params[:fields] and params[:fields].is_a? Array - @query.filters = {} - params[:fields].each do |field| - @query.add_filter(field, params[:operators][field], params[:values][field]) + if params[:query_id] + @query = @project.queries.find(params[:query_id]) + else + if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id + # Give it a name, required to be valid + @query = Query.new(:name => "_") + @query.project = @project + if params[:fields] and params[:fields].is_a? Array + params[:fields].each do |field| + @query.add_filter(field, params[:operators][field], params[:values][field]) + end + else + @query.available_filters.keys.each do |field| + @query.add_short_filter(field, params[field]) if params[field] + end + end + session[:query] = @query + else + @query = session[:query] 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 @@ -226,14 +238,15 @@ class ProjectsController < ApplicationController @results_per_page = session[:results_per_page] || 25 end - @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 => [ :author, :status, :tracker, :project ], - :conditions => @query.statement, - :limit => @issue_pages.items_per_page, - :offset => @issue_pages.current.offset - + if @query.valid? + @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 => [ :author, :status, :tracker, :project ], + :conditions => @query.statement, + :limit => @issue_pages.items_per_page, + :offset => @issue_pages.current.offset + end render :layout => false if request.xhr? end @@ -309,6 +322,22 @@ class ProjectsController < ApplicationController end end + def add_query + @query = Query.new(params[:query]) + @query.project = @project + @query.user = logged_in_user + + params[:fields].each do |field| + @query.add_filter(field, params[:operators][field], params[:values][field]) + end if params[:fields] + + if request.post? and @query.save + flash[:notice] = l(:notice_successful_create) + redirect_to :controller => 'reports', :action => 'issue_report', :id => @project + end + render :layout => false if request.xhr? + end + # Add a news to @project def add_news @news = News.new(:project => @project) diff --git a/queries/trunk/app/controllers/queries_controller.rb b/queries/trunk/app/controllers/queries_controller.rb index be7cb2478..ebe008ca0 100644 --- a/queries/trunk/app/controllers/queries_controller.rb +++ b/queries/trunk/app/controllers/queries_controller.rb @@ -1,55 +1,47 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + class QueriesController < ApplicationController layout 'base' - - def index - list - render :action => 'list' - end - - # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html) - verify :method => :post, :only => [ :destroy, :create, :update ], - :redirect_to => { :action => :list } - - def list - @query_pages, @queries = paginate :queries, :per_page => 10 - end - - def show - @query = Query.find(params[:id]) - end - - def new - @query = Query.new(params[:query]) - - params[:fields].each do |field| - @query.add_filter(field, params[:operators][field], params[:values][field]) - end if params[:fields] - - if request.post? and @query.save - flash[:notice] = 'Query was successfully created.' - redirect_to :action => 'list' - end - end + before_filter :require_login, :find_query def edit - @query = Query.find(params[:id]) - if request.post? @query.filters = {} params[:fields].each do |field| @query.add_filter(field, params[:operators][field], params[:values][field]) end if params[:fields] @query.attributes = params[:query] - + if @query.save - flash[:notice] = 'Query was successfully updated.' - redirect_to :action => 'show', :id => @query + flash[:notice] = l(:notice_successful_update) + redirect_to :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => @query end end end def destroy - Query.find(params[:id]).destroy - redirect_to :action => 'list' + @query.destroy if request.post? + redirect_to :controller => 'reports', :action => 'issue_report', :id => @project + end + +private + def find_query + @query = Query.find(params[:id]) + @project = @query.project end end diff --git a/queries/trunk/app/controllers/reports_controller.rb b/queries/trunk/app/controllers/reports_controller.rb index 985c937fc..c10929d5b 100644 --- a/queries/trunk/app/controllers/reports_controller.rb +++ b/queries/trunk/app/controllers/reports_controller.rb @@ -48,6 +48,7 @@ class ReportsController < ApplicationController @report_title = l(:field_author) render :template => "reports/issue_report_details" else + @queries = @project.queries.find :all, :conditions => ["is_public=? or user_id=?", true, (logged_in_user ? logged_in_user.id : 0)] @trackers = Tracker.find(:all) @priorities = Enumeration::get_values('IPRI') @categories = @project.issue_categories diff --git a/queries/trunk/app/models/project.rb b/queries/trunk/app/models/project.rb index ae7436910..cf17f0f5a 100644 --- a/queries/trunk/app/models/project.rb +++ b/queries/trunk/app/models/project.rb @@ -21,6 +21,7 @@ class Project < ActiveRecord::Base has_many :users, :through => :members has_many :custom_values, :dependent => true, :as => :customized has_many :issues, :dependent => true, :order => "issues.created_on DESC", :include => :status + has_many :queries, :dependent => true has_many :documents, :dependent => true has_many :news, :dependent => true, :include => :author has_many :issue_categories, :dependent => true, :order => "issue_categories.name" diff --git a/queries/trunk/app/models/query.rb b/queries/trunk/app/models/query.rb index 8e826da53..0f3dc8887 100644 --- a/queries/trunk/app/models/query.rb +++ b/queries/trunk/app/models/query.rb @@ -1,6 +1,27 @@ +# redMine - project management software +# Copyright (C) 2006 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + class Query < ActiveRecord::Base + belongs_to :project + belongs_to :user serialize :filters + attr_protected :project, :user + validates_presence_of :name, :on => :save @@operators = { "=" => "Egal", @@ -15,58 +36,75 @@ class Query < ActiveRecord::Base "t" => "Aujourd'hui", ">t-" => "Il y a moins de", " "Il y a plus de", - "t-" => "Il y a exactement" } + "t-" => "Il y a exactement", + "~" => "Contient", + "!~" => "Ne contient pas" } @@operators_by_filter_type = { :list => [ "=", "!" ], - :list_status => [ "o", "=", "!", "c" ], + :list_status => [ "o", "=", "!", "c", "*" ], :list_optional => [ "=", "!", "!*", "*" ], :date => [ "t+", "t+", "t", ">t-", " [ ">t-", " [ ">t-", " [ "~", "!~" ] } - @@available_filters = { "status_id" => { :type => :list_status, :order => 1, - :values => IssueStatus.find(:all).collect{|s| [s.name, s.id.to_s] } }, - "tracker_id" => { :type => :list, :order => 2, - :values => Tracker.find(:all).collect{|s| [s.name, s.id.to_s] } }, - "assigned_to_id" => { :type => :list_optional, :order => 3, - :values => User.find(:all).collect{|s| [s.display_name, s.id.to_s] } }, - "priority_id" => { :type => :list, :order => 4, - :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } }, - "created_on" => { :type => :date_past, :order => 5 }, - "updated_on" => { :type => :date_past, :order => 6 }, - "start_date" => { :type => :date, :order => 7 }, - "due_date" => { :type => :date, :order => 8 } } - - cattr_accessor :available_filters - def initialize(attributes = nil) - super - self.filters ||= { 'status_id' => {:operator => "o"} } + super attributes + self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} } end def validate errors.add_to_base "Au moins un critere doit etre selectionne" unless filters && !filters.empty? filters.each_key do |field| - errors.add field.gsub(/\_id$/, ""), "doit etre renseigne" unless + errors.add field.gsub(/\_id$/, ""), :activerecord_error_blank unless # filter requires one or more values (values_for(field) and !values_for(field).first.empty?) or # filter doesn't require any value ["o", "c", "!*", "*", "t"].include? operator_for(field) end if filters - end + end + + def available_filters + return @available_filters if @available_filters + @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all).collect{|s| [s.name, s.id.to_s] } }, + "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all).collect{|s| [s.name, s.id.to_s] } }, + "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } }, + "subject" => { :type => :text, :order => 7 }, + "created_on" => { :type => :date_past, :order => 8 }, + "updated_on" => { :type => :date_past, :order => 9 }, + "start_date" => { :type => :date, :order => 10 }, + "due_date" => { :type => :date, :order => 11 } } + unless project.nil? + # project specific filters + @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } } + @available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } } + @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } } + # remove category filter if no category defined + @available_filters.delete "category_id" if @available_filters["category_id"][:values].empty? + end + @available_filters + end def add_filter(field, operator, values) # values must be an 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] + if available_filters.has_key? field + filter_options = available_filters[field] # check if operator is allowed for that filter - if @@operators_by_filter_type[filter_options[:type]].include? operator - filters[field] = {:operator => operator, :values => values } - end + #if @@operators_by_filter_type[filter_options[:type]].include? operator + # allowed_values = values & ([""] + (filter_options[:values] || []).collect {|val| val[1]}) + # filters[field] = {:operator => operator, :values => allowed_values } if (allowed_values.first and !allowed_values.first.empty?) or ["o", "c", "!*", "*", "t"].include? operator + #end + filters[field] = {:operator => operator, :values => values } end end - + + def add_short_filter(field, expression) + return unless expression + parms = expression.scan(/^(o|c|\!|\*)?(.*)$/).first + add_filter field, (parms[0] || "="), [parms[1] || ""] + end + def has_filter?(field) filters and filters[field] end @@ -82,8 +120,9 @@ class Query < ActiveRecord::Base def statement sql = "1=1" filters.each_key do |field| + v = values_for field + next unless v and !v.empty? sql = sql + " AND " unless sql.empty? - v = values_for field case operator_for field when "=" sql = sql + "issues.#{field} IN (" + v.each(&:to_i).join(",") + ")" @@ -111,6 +150,10 @@ class Query < ActiveRecord::Base sql = sql + "issues.#{field} = '" + (Date.today + v.first.to_i).strftime("%Y-%m-%d") + "'" when "t" sql = sql + "issues.#{field} = '%s'" % connection.quoted_date(Date.today) + when "~" + sql = sql + "issues.#{field} LIKE '%#{connection.quote_string(v.first)}%'" + when "!~" + sql = sql + "issues.#{field} NOT LIKE '%#{connection.quote_string(v.first)}%'" end end if filters sql diff --git a/queries/trunk/app/views/projects/add_query.rhtml b/queries/trunk/app/views/projects/add_query.rhtml new file mode 100644 index 000000000..174a1bc2f --- /dev/null +++ b/queries/trunk/app/views/projects/add_query.rhtml @@ -0,0 +1,6 @@ +

<%= l(:label_query_new) %>

+ +<%= start_form_tag :action => 'add_query', :id => @project %> + <%= render :partial => 'queries/form', :locals => {:query => @query} %> + <%= submit_tag l(:button_create) %> +<%= end_form_tag %> \ No newline at end of file diff --git a/queries/trunk/app/views/projects/list_issues.rhtml b/queries/trunk/app/views/projects/list_issues.rhtml index b4dff2c9c..1add26497 100644 --- a/queries/trunk/app/views/projects/list_issues.rhtml +++ b/queries/trunk/app/views/projects/list_issues.rhtml @@ -1,25 +1,46 @@ -

<%=l(:label_issue_plural)%>

-
- -<%= l(:label_export_to) %>  -<%= link_to 'CSV', :action => 'export_issues_csv', :id => @project %>, -<%= link_to 'PDF', :action => 'export_issues_pdf', :id => @project %> - -
- -<%= start_form_tag :action => 'list_issues' %> -<%= render :partial => 'queries/filters', :locals => {:query => @query} %> - - - - -
-<%= submit_tag l(:button_apply), :class => "button-small" %> -<%= end_form_tag %> -<%= start_form_tag :action => 'list_issues', :set_filter => 1 %> -<%= submit_tag l(:button_clear), :class => "button-small" %> -<%= end_form_tag %> -
+<% if @query.new_record? %> +
+ + <%= l(:label_export_to) %> + <%= link_to 'CSV', :action => 'export_issues_csv', :id => @project %>, + <%= link_to 'PDF', :action => 'export_issues_pdf', :id => @project %> + +
+

<%=l(:label_issue_plural)%>

+ + <%= start_form_tag({:action => 'list_issues'}, :id => 'query_form') %> + <%= render :partial => 'queries/filters', :locals => {:query => @query} %> + <%= end_form_tag %> + + + + +
+ <%= link_to_remote l(:button_apply), + :url => { :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 }, + :update => "content", + :with => "Form.serialize('query_form')" %> + | + <%= link_to l(:button_clear), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1 %> + <% if loggedin? %> + | + <%= link_to_remote l(:button_save), + :url => { :controller => 'projects', :action => "add_query", :id => @project }, + :method => 'get', + :update => "content", + :with => "Form.serialize('query_form')" %> + <% end %> +
+<% else %> +
+ <%= link_to l(:button_edit), :controller => 'queries', :action => 'edit', :id => @query %> + <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :post => true %> +
+ +

<%= @query.name %>

+<% end %> +<%= error_messages_for 'query' %> +<% if @query.valid? %>   @@ -65,4 +86,5 @@ [ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]

<%= submit_tag l(:button_move) %> -<%= end_form_tag %> \ No newline at end of file +<%= end_form_tag %> +<% end %> \ No newline at end of file diff --git a/queries/trunk/app/views/queries/_filters.rhtml b/queries/trunk/app/views/queries/_filters.rhtml index f98f53de1..31f9e83a2 100644 --- a/queries/trunk/app/views/queries/_filters.rhtml +++ b/queries/trunk/app/views/queries/_filters.rhtml @@ -55,12 +55,12 @@ function toggle_multi_select(field) { -
Filtres +
<%= l(:label_filter_plural) %>
-<% Query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %> +<% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %> <% field = filter[0] options = filter[1] %> id="tr_<%= field %>"> @@ -81,6 +81,8 @@ 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 + <% when :text %> + <%= text_field_tag "values[#{field}][]", query.values_for(field), :size => 30, :class => "select-small" %> <% end %> @@ -90,8 +92,8 @@ function toggle_multi_select(field) {
-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" %> +<%= 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| [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" %>
diff --git a/queries/trunk/app/views/queries/_form.rhtml b/queries/trunk/app/views/queries/_form.rhtml index 7bbe608c5..2ff6ad35f 100644 --- a/queries/trunk/app/views/queries/_form.rhtml +++ b/queries/trunk/app/views/queries/_form.rhtml @@ -11,7 +11,7 @@ <%= check_box 'query', 'is_public' %>

-<%= render :partial => 'filters', :locals => {:query => query}%> +<%= render :partial => 'queries/filters', :locals => {:query => query}%> diff --git a/queries/trunk/app/views/queries/edit.rhtml b/queries/trunk/app/views/queries/edit.rhtml index c57d74183..71f146f1b 100644 --- a/queries/trunk/app/views/queries/edit.rhtml +++ b/queries/trunk/app/views/queries/edit.rhtml @@ -1,8 +1,6 @@ -

Editing query

+

<%= l(:label_query) %>

<%= start_form_tag :action => 'edit', :id => @query %> <%= render :partial => 'form', :locals => {:query => @query} %> - <%= submit_tag 'Edit' %> -<%= end_form_tag %> - -<%= debug @query.statement %> \ No newline at end of file + <%= submit_tag l(:button_save) %> +<%= end_form_tag %> \ No newline at end of file diff --git a/queries/trunk/app/views/queries/list.rhtml b/queries/trunk/app/views/queries/list.rhtml deleted file mode 100644 index 862029008..000000000 --- a/queries/trunk/app/views/queries/list.rhtml +++ /dev/null @@ -1,27 +0,0 @@ -

Listing queries

- - - - <% for column in Query.content_columns %> - - <% end %> - - -<% for query in @queries %> - - <% for column in Query.content_columns %> - - <% end %> - - - - -<% end %> -
<%= column.human_name %>
<%=h query.send(column.name) %><%= link_to 'Show', :action => 'show', :id => query %><%= link_to 'Edit', :action => 'edit', :id => query %><%= link_to 'Destroy', { :action => 'destroy', :id => query }, :confirm => 'Are you sure?', :post => true %>
- -<%= link_to 'Previous page', { :page => @query_pages.current.previous } if @query_pages.current.previous %> -<%= link_to 'Next page', { :page => @query_pages.current.next } if @query_pages.current.next %> - -
- -<%= link_to 'New query', :action => 'new' %> diff --git a/queries/trunk/app/views/queries/new.rhtml b/queries/trunk/app/views/queries/new.rhtml deleted file mode 100644 index 0b1668a50..000000000 --- a/queries/trunk/app/views/queries/new.rhtml +++ /dev/null @@ -1,9 +0,0 @@ -

New query

- -<%= start_form_tag :action => 'new' %> - <%= render :partial => 'form', :locals => {:query => @query} %> - <%= submit_tag "Create" %> -<%= end_form_tag %> - -<%= debug @query %> -<%= debug params %> diff --git a/queries/trunk/app/views/queries/show.rhtml b/queries/trunk/app/views/queries/show.rhtml deleted file mode 100644 index 6118f735f..000000000 --- a/queries/trunk/app/views/queries/show.rhtml +++ /dev/null @@ -1,8 +0,0 @@ -<% for column in Query.content_columns %> -

- <%= column.human_name %>: <%=h @query.send(column.name) %> -

-<% end %> - -<%= link_to 'Edit', :action => 'edit', :id => @query %> | -<%= link_to 'Back', :action => 'list' %> diff --git a/queries/trunk/app/views/reports/_details.rhtml b/queries/trunk/app/views/reports/_details.rhtml index be4c82e77..12a16c1e7 100644 --- a/queries/trunk/app/views/reports/_details.rhtml +++ b/queries/trunk/app/views/reports/_details.rhtml @@ -29,17 +29,17 @@ :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, "#{field_name}" => row.id, - "status_id" => "O" %> + "status_id" => "o" %> <%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, "#{field_name}" => row.id, - "status_id" => "C" %> + "status_id" => "c" %> <%= link_to (aggregate data, { field_name => row.id }), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, "#{field_name}" => row.id, - "status_id" => "A" %> + "status_id" => "*" %> <% end %> diff --git a/queries/trunk/app/views/reports/_simple.rhtml b/queries/trunk/app/views/reports/_simple.rhtml index 3be1281c5..778b9cbde 100644 --- a/queries/trunk/app/views/reports/_simple.rhtml +++ b/queries/trunk/app/views/reports/_simple.rhtml @@ -18,17 +18,17 @@ :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, "#{field_name}" => row.id, - "status_id" => "O" %> + "status_id" => "o" %> <%= link_to (aggregate data, { field_name => row.id, "closed" => 1 }), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, "#{field_name}" => row.id, - "status_id" => "C" %> + "status_id" => "c" %> <%= link_to (aggregate data, { field_name => row.id }), :controller => 'projects', :action => 'list_issues', :id => @project, :set_filter => 1, "#{field_name}" => row.id, - "status_id" => "A" %> + "status_id" => "*" %> <% end %> diff --git a/queries/trunk/app/views/reports/issue_report.rhtml b/queries/trunk/app/views/reports/issue_report.rhtml index 4927186a9..593efa6ca 100644 --- a/queries/trunk/app/views/reports/issue_report.rhtml +++ b/queries/trunk/app/views/reports/issue_report.rhtml @@ -1,18 +1,30 @@

<%=l(:label_report_plural)%>

+

<%= l(:label_query_plural) %>

+
+<%= link_to_if_authorized l(:label_query_new), :controller => 'projects', :action => 'add_query', :id => @project %> +
+ +<% if @queries.empty? %>

<%=l(:label_no_data)%>

<% end %> +
    +<% @queries.each do |query| %> +
  • <%= link_to query.name, :controller => 'projects', :action => 'list_issues', :id => @project, :query_id => query %>
    • +<% end %> +
+
-

<%=l(:field_tracker)%>  <%= link_to image_tag('details'), :detail => 'author' %>

+

<%=l(:field_tracker)%>  <%= link_to image_tag('details'), :detail => 'tracker' %>

<%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
-

<%=l(:field_priority)%>  <%= link_to image_tag('details'), :detail => 'priority' %>

-<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> -

<%=l(:field_author)%>  <%= link_to image_tag('details'), :detail => 'author' %>

<%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
+

<%=l(:field_priority)%>  <%= link_to image_tag('details'), :detail => 'priority' %>

+<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %> +

<%=l(:field_category)%>  <%= link_to image_tag('details'), :detail => 'category' %>

<%= render :partial => 'simple', :locals => { :data => @issues_by_category, :field_name => "category_id", :rows => @categories } %>
diff --git a/queries/trunk/lang/de.yml b/queries/trunk/lang/de.yml index 3cff24ed3..b3c8d919c 100644 --- a/queries/trunk/lang/de.yml +++ b/queries/trunk/lang/de.yml @@ -259,6 +259,11 @@ label_internal: Intern label_last_changes: %d änderungen des Letzten label_change_view_all: Alle änderungen ansehen label_personalize_page: Diese Seite personifizieren +label_query: Benutzerdefiniertes Frage +label_query_plural: Benutzerdefinierte Fragen +label_query_new: Neue Frage +label_filter_add: Filter addieren +label_filter_plural: Filter button_login: Einloggen button_submit: Einreichen diff --git a/queries/trunk/lang/en.yml b/queries/trunk/lang/en.yml index d64edea78..c70311434 100644 --- a/queries/trunk/lang/en.yml +++ b/queries/trunk/lang/en.yml @@ -259,6 +259,11 @@ label_internal: Internal label_last_changes: last %d changes label_change_view_all: View all changes label_personalize_page: Personalize this page +label_query: Custom query +label_query_plural: Custom queries +label_query_new: New query +label_filter_add: Add filter +label_filter_plural: Filters button_login: Login button_submit: Submit diff --git a/queries/trunk/lang/es.yml b/queries/trunk/lang/es.yml index 13894955c..0bc1846b7 100644 --- a/queries/trunk/lang/es.yml +++ b/queries/trunk/lang/es.yml @@ -259,6 +259,11 @@ label_internal: Interno label_last_changes: %d cambios del último label_change_view_all: Ver todos los cambios label_personalize_page: Personalizar esta página +label_query: Pregunta personalizada +label_query_plural: Preguntas personalizadas +label_query_new: Nueva preguntas +label_filter_add: Agregar el filtro +label_filter_plural: Filtros button_login: Conexión button_submit: Someter diff --git a/queries/trunk/lang/fr.yml b/queries/trunk/lang/fr.yml index cdfabd7dd..7d5635d3f 100644 --- a/queries/trunk/lang/fr.yml +++ b/queries/trunk/lang/fr.yml @@ -260,6 +260,11 @@ label_internal: Interne label_last_changes: %d derniers changements label_change_view_all: Voir tous les changements label_personalize_page: Personnaliser cette page +label_query: Rapport personnalisé +label_query_plural: Rapports personnalisés +label_query_new: Nouveau rapport +label_filter_add: Ajouter le filtre +label_filter_plural: Filtres button_login: Connexion button_submit: Soumettre