jro_apps/redmine Commit - r11764:888c3581eb0f

Role based custom queries (#1019)....

Jean-Philippe Lang -

r11764:888c3581eb0f

parent child

Context file:

r11764:888c3581eb0f

Collapse all files

The requested changes are too big and content was truncated. Show full diff

db/migrate/20130602092539_create_queries_roles.rb created 644 +13 0

@@ -0,0 +1,13
	1	class CreateQueriesRoles < ActiveRecord::Migration
	2	def self.up
	3	create_table :queries_roles, :id => false do \|t\|
	4	t.column :query_id, :integer, :null => false
	5	t.column :role_id, :integer, :null => false
	6	end
	7	add_index :queries_roles, [:query_id, :role_id], :unique => true, :name => :queries_roles_ids
	8	end
	9
	10	def self.down
	11	drop_table :queries_roles
	12	end
	13	end

db/migrate/20130710182539_add_queries_visibility.rb created 644 +13 0

@@ -0,0 +1,13
	1	class AddQueriesVisibility < ActiveRecord::Migration
	2	def up
	3	add_column :queries, :visibility, :integer, :default => 0
	4	Query.where(:is_public => true).update_all(:visibility => 2)
	5	remove_column :queries, :is_public
	6	end
	7
	8	def down
	9	add_column :queries, :is_public, :boolean, :default => true, :null => false
	10	Query.where('visibility <> ?', 2).update_all(:is_public => false)
	11	remove_column :queries, :visibility
	12	end
	13	end

app/controllers/queries_controller.rb +3 -3

             # Redmine - project management software
             # Copyright (C) 2006-2013  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
               menu_item :issues
               before_filter :find_query, :except => [:new, :create, :index]
               before_filter :find_optional_project, :only => [:new, :create]
               accept_api_auth :index
               include QueriesHelper
               def index
                 case params[:format]
                 when 'xml', 'json'
                   @offset, @limit = api_offset_and_limit
                 else
                   @limit = per_page_option
                 end
                 @query_count = IssueQuery.visible.count
                 @query_pages = Paginator.new @query_count, @limit, params['page']
                 @queries = IssueQuery.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
                 respond_to do |format|
                   format.api
                 end
               end
               def new
                 @query = IssueQuery.new
                 @query.user = User.current
                 @query.project = @project
-                @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
+                @query.visibility = IssueQuery::VISIBILITY_PRIVATE unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                 @query.build_from_params(params)
               end
               def create
                 @query = IssueQuery.new(params[:query])
                 @query.user = User.current
                 @query.project = params[:query_is_for_all] ? nil : @project
-                @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
+                @query.visibility = IssueQuery::VISIBILITY_PRIVATE unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                 @query.build_from_params(params)
                 @query.column_names = nil if params[:default_columns]
                 if @query.save
                   flash[:notice] = l(:notice_successful_create)
                   redirect_to _project_issues_path(@project, :query_id => @query)
                 else
                   render :action => 'new', :layout => !request.xhr?
                 end
               end
               def edit
               end
               def update
                 @query.attributes = params[:query]
                 @query.project = nil if params[:query_is_for_all]
-                @query.is_public = false unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
+                @query.visibility = IssueQuery::VISIBILITY_PRIVATE unless User.current.allowed_to?(:manage_public_queries, @project) || User.current.admin?
                 @query.build_from_params(params)
                 @query.column_names = nil if params[:default_columns]
                 if @query.save
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to _project_issues_path(@project, :query_id => @query)
                 else
                   render :action => 'edit'
                 end
               end
               def destroy
                 @query.destroy
                 redirect_to _project_issues_path(@project, :set_filter => 1)
               end
             private
               def find_query
                 @query = IssueQuery.find(params[:id])
                 @project = @query.project
                 render_403 unless @query.editable_by?(User.current)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
               def find_optional_project
                 @project = Project.find(params[:project_id]) if params[:project_id]
                 render_403 unless User.current.allowed_to?(:save_queries, @project, :global => true)
               rescue ActiveRecord::RecordNotFound
                 render_404
               end
             end

app/helpers/issues_helper.rb +2 -2

             # encoding: utf-8
             #
             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             module IssuesHelper
               include ApplicationHelper
               def issue_list(issues, &block)
                 ancestors = []
                 issues.each do |issue|
                   while (ancestors.any? && !issue.is_descendant_of?(ancestors.last))
                     ancestors.pop
                   end
                   yield issue, ancestors.size
                   ancestors << issue unless issue.leaf?
                 end
               end
               # Renders a HTML/CSS tooltip
               #
               # To use, a trigger div is needed.  This is a div with the class of "tooltip"
               # that contains this method wrapped in a span with the class of "tip"
               #
               #    <div class="tooltip"><%= link_to_issue(issue) %>
               #      <span class="tip"><%= render_issue_tooltip(issue) %></span>
               #    </div>
               #
               def render_issue_tooltip(issue)
                 @cached_label_status ||= l(:field_status)
                 @cached_label_start_date ||= l(:field_start_date)
                 @cached_label_due_date ||= l(:field_due_date)
                 @cached_label_assigned_to ||= l(:field_assigned_to)
                 @cached_label_priority ||= l(:field_priority)
                 @cached_label_project ||= l(:field_project)
                 link_to_issue(issue) + "<br /><br />".html_safe +
                   "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
                   "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
                   "<strong>#{@cached_label_start_date}</strong>: #{format_date(issue.start_date)}<br />".html_safe +
                   "<strong>#{@cached_label_due_date}</strong>: #{format_date(issue.due_date)}<br />".html_safe +
                   "<strong>#{@cached_label_assigned_to}</strong>: #{h(issue.assigned_to)}<br />".html_safe +
                   "<strong>#{@cached_label_priority}</strong>: #{h(issue.priority.name)}".html_safe
               end
               def issue_heading(issue)
                 h("#{issue.tracker} ##{issue.id}")
               end
               def render_issue_subject_with_tree(issue)
                 s = ''
                 ancestors = issue.root? ? [] : issue.ancestors.visible.all
                 ancestors.each do |ancestor|
                   s << '<div>' + content_tag('p', link_to_issue(ancestor, :project => (issue.project_id != ancestor.project_id)))
                 end
                 s << '<div>'
                 subject = h(issue.subject)
                 if issue.is_private?
                   subject = content_tag('span', l(:field_is_private), :class => 'private') + ' ' + subject
                 end
                 s << content_tag('h3', subject)
                 s << '</div>' * (ancestors.size + 1)
                 s.html_safe
               end
               def render_descendants_tree(issue)
                 s = '<form><table class="list issues">'
                 issue_list(issue.descendants.visible.sort_by(&:lft)) do |child, level|
                   css = "issue issue-#{child.id} hascontextmenu"
                   css << " idnt idnt-#{level}" if level > 0
                   s << content_tag('tr',
                          content_tag('td', check_box_tag("ids[]", child.id, false, :id => nil), :class => 'checkbox') +
                          content_tag('td', link_to_issue(child, :truncate => 60, :project => (issue.project_id != child.project_id)), :class => 'subject') +
                          content_tag('td', h(child.status)) +
                          content_tag('td', link_to_user(child.assigned_to)) +
                          content_tag('td', progress_bar(child.done_ratio, :width => '80px')),
                          :class => css)
                 end
                 s << '</table></form>'
                 s.html_safe
               end
               # Returns an array of error messages for bulk edited issues
               def bulk_edit_error_messages(issues)
                 messages = {}
                 issues.each do |issue|
                   issue.errors.full_messages.each do |message|
                     messages[message] ||= []
                     messages[message] << issue
                   end
                 end
                 messages.map { |message, issues|
                   "#{message}: " + issues.map {|i| "##{i.id}"}.join(', ')
                 }
              end
               # Returns a link for adding a new subtask to the given issue
               def link_to_new_subtask(issue)
                 attrs = {
                   :tracker_id => issue.tracker,
                   :parent_issue_id => issue
                 }
                 link_to(l(:button_add), new_project_issue_path(issue.project, :issue => attrs))
               end
               class IssueFieldsRows
                 include ActionView::Helpers::TagHelper
                 def initialize
                   @left = []
                   @right = []
                 end
                 def left(*args)
                   args.any? ? @left << cells(*args) : @left
                 end
                 def right(*args)
                   args.any? ? @right << cells(*args) : @right
                 end
                 def size
                   @left.size > @right.size ? @left.size : @right.size
                 end
                 def to_html
                   html = ''.html_safe
                   blank = content_tag('th', '') + content_tag('td', '')
                   size.times do |i|
                     left = @left[i] || blank
                     right = @right[i] || blank
                     html << content_tag('tr', left + right)
                   end
                   html
                 end
                 def cells(label, text, options={})
                   content_tag('th', "#{label}:", options) + content_tag('td', text, options)
                 end
               end
               def issue_fields_rows
                 r = IssueFieldsRows.new
                 yield r
                 r.to_html
               end
               def render_custom_fields_rows(issue)
                 return if issue.custom_field_values.empty?
                 ordered_values = []
                 half = (issue.custom_field_values.size / 2.0).ceil
                 half.times do |i|
                   ordered_values << issue.custom_field_values[i]
                   ordered_values << issue.custom_field_values[i + half]
                 end
                 s = "<tr>\n"
                 n = 0
                 ordered_values.compact.each do |value|
                   s << "</tr>\n<tr>\n" if n > 0 && (n % 2) == 0
                   s << "\t<th>#{ h(value.custom_field.name) }:</th><td>#{ simple_format_without_paragraph(h(show_value(value))) }</td>\n"
                   n += 1
                 end
                 s << "</tr>\n"
                 s.html_safe
               end
               def issues_destroy_confirmation_message(issues)
                 issues = [issues] unless issues.is_a?(Array)
                 message = l(:text_issues_destroy_confirmation)
                 descendant_count = issues.inject(0) {|memo, i| memo += (i.right - i.left - 1)/2}
                 if descendant_count > 0
                   issues.each do |issue|
                     next if issue.root?
                     issues.each do |other_issue|
                       descendant_count -= 1 if issue.is_descendant_of?(other_issue)
                     end
                   end
                   if descendant_count > 0
                     message << "\n" + l(:text_issues_destroy_descendants_confirmation, :count => descendant_count)
                   end
                 end
                 message
               end
               def sidebar_queries
                 unless @sidebar_queries
                   @sidebar_queries = IssueQuery.visible.
                     order("#{Query.table_name}.name ASC").
                     # Project specific queries and global queries
                     where(@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id]).
                     all
                 end
                 @sidebar_queries
               end
               def query_links(title, queries)
                 return '' if queries.empty?
                 # links to #index on issues/show
                 url_params = controller_name == 'issues' ? {:controller => 'issues', :action => 'index', :project_id => @project} : params
                 content_tag('h3', title) + "\n" +
                   content_tag('ul',
                     queries.collect {|query|
                         css = 'query'
                         css << ' selected' if query == @query
                         content_tag('li', link_to(query.name, url_params.merge(:query_id => query), :class => css))
                       }.join("\n").html_safe,
                     :class => 'queries'
                   ) + "\n"
               end
               def render_sidebar_queries
                 out = ''.html_safe
-                out << query_links(l(:label_my_queries), sidebar_queries.reject(&:is_public?))
+                out << query_links(l(:label_my_queries), sidebar_queries.select(&:is_private?))
-                out << query_links(l(:label_query_plural), sidebar_queries.select(&:is_public?))
+                out << query_links(l(:label_query_plural), sidebar_queries.reject(&:is_private?))
                 out
               end
               # Returns the textual representation of a journal details
               # as an array of strings
               def details_to_strings(details, no_html=false, options={})
                 options[:only_path] = (options[:only_path] == false ? false : true)
                 strings = []
                 values_by_field = {}
                 details.each do |detail|
                   if detail.property == 'cf'
                     field_id = detail.prop_key
                     field = CustomField.find_by_id(field_id)
                     if field && field.multiple?
                       values_by_field[field_id] ||= {:added => [], :deleted => []}
                       if detail.old_value
                         values_by_field[field_id][:deleted] << detail.old_value
                       end
                       if detail.value
                         values_by_field[field_id][:added] << detail.value
                       end
                       next
                     end
                   end
                   strings << show_detail(detail, no_html, options)
                 end
                 values_by_field.each do |field_id, changes|
                   detail = JournalDetail.new(:property => 'cf', :prop_key => field_id)
                   if changes[:added].any?
                     detail.value = changes[:added]
                     strings << show_detail(detail, no_html, options)
                   elsif changes[:deleted].any?
                     detail.old_value = changes[:deleted]
                     strings << show_detail(detail, no_html, options)
                   end
                 end
                 strings
               end
               # Returns the textual representation of a single journal detail
               def show_detail(detail, no_html=false, options={})
                 multiple = false
                 case detail.property
                 when 'attr'
                   field = detail.prop_key.to_s.gsub(/\_id$/, "")
                   label = l(("field_" + field).to_sym)
                   case detail.prop_key
                   when 'due_date', 'start_date'
                     value = format_date(detail.value.to_date) if detail.value
                     old_value = format_date(detail.old_value.to_date) if detail.old_value
                   when 'project_id', 'status_id', 'tracker_id', 'assigned_to_id',
                         'priority_id', 'category_id', 'fixed_version_id'
                     value = find_name_by_reflection(field, detail.value)
                     old_value = find_name_by_reflection(field, detail.old_value)
                   when 'estimated_hours'
                     value = "%0.02f" % detail.value.to_f unless detail.value.blank?
                     old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
                   when 'parent_id'
                     label = l(:field_parent_issue)
                     value = "##{detail.value}" unless detail.value.blank?
                     old_value = "##{detail.old_value}" unless detail.old_value.blank?
                   when 'is_private'
                     value = l(detail.value == "0" ? :general_text_No : :general_text_Yes) unless detail.value.blank?
                     old_value = l(detail.old_value == "0" ? :general_text_No : :general_text_Yes) unless detail.old_value.blank?
                   end
                 when 'cf'
                   custom_field = CustomField.find_by_id(detail.prop_key)
                   if custom_field
                     multiple = custom_field.multiple?
                     label = custom_field.name
                     value = format_value(detail.value, custom_field.field_format) if detail.value
                     old_value = format_value(detail.old_value, custom_field.field_format) if detail.old_value
                   end
                 when 'attachment'
                   label = l(:label_attachment)
                 when 'relation'
                   if detail.value && !detail.old_value
                     rel_issue = Issue.visible.find_by_id(detail.value)
                     value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.value}" :
                               (no_html ? rel_issue : link_to_issue(rel_issue))
                   elsif detail.old_value && !detail.value
                     rel_issue = Issue.visible.find_by_id(detail.old_value)
                     old_value = rel_issue.nil? ? "#{l(:label_issue)} ##{detail.old_value}" :
                                       (no_html ? rel_issue : link_to_issue(rel_issue))
                   end
                   label = l(detail.prop_key.to_sym)
                 end
                 call_hook(:helper_issues_show_detail_after_setting,
                           {:detail => detail, :label => label, :value => value, :old_value => old_value })
                 label ||= detail.prop_key
                 value ||= detail.value
                 old_value ||= detail.old_value
                 unless no_html
                   label = content_tag('strong', label)
                   old_value = content_tag("i", h(old_value)) if detail.old_value
                   if detail.old_value && detail.value.blank? && detail.property != 'relation'
                     old_value = content_tag("del", old_value)
                   end
                   if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key)
                     # Link to the attachment if it has not been removed
                     value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
                     if options[:only_path] != false && atta.is_text?
                       value += link_to(
                                    image_tag('magnifier.png'),
                                    :controller => 'attachments', :action => 'show',
                                    :id => atta, :filename => atta.filename
                                  )
                     end
                   else
                     value = content_tag("i", h(value)) if value
                   end
                 end
                 if detail.property == 'attr' && detail.prop_key == 'description'
                   s = l(:text_journal_changed_no_detail, :label => label)
                   unless no_html
                     diff_link = link_to 'diff',
                       {:controller => 'journals', :action => 'diff', :id => detail.journal_id,
                        :detail_id => detail.id, :only_path => options[:only_path]},
                       :title => l(:label_view_diff)
                     s << " (#{ diff_link })"
                   end
                   s.html_safe
                 elsif detail.value.present?
                   case detail.property
                   when 'attr', 'cf'
                     if detail.old_value.present?
                       l(:text_journal_changed, :label => label, :old => old_value, :new => value).html_safe
                     elsif multiple
                       l(:text_journal_added, :label => label, :value => value).html_safe
                     else
                       l(:text_journal_set_to, :label => label, :value => value).html_safe
                     end
                   when 'attachment', 'relation'
                     l(:text_journal_added, :label => label, :value => value).html_safe
                   end
                 else
                   l(:text_journal_deleted, :label => label, :old => old_value).html_safe
                 end
               end
               # Find the name of an associated record stored in the field attribute
               def find_name_by_reflection(field, id)
                 unless id.present?
                   return nil
                 end
                 association = Issue.reflect_on_association(field.to_sym)
                 if association
                   record = association.class_name.constantize.find_by_id(id)
                   if record
                     record.name.force_encoding('UTF-8') if record.name.respond_to?(:force_encoding)
                     return record.name
                   end
                 end
               end
               # Renders issue children recursively
               def render_api_issue_children(issue, api)
                 return if issue.leaf?
                 api.array :children do
                   issue.children.each do |child|
                     api.issue(:id => child.id) do
                       api.tracker(:id => child.tracker_id, :name => child.tracker.name) unless child.tracker.nil?
                       api.subject child.subject
                       render_api_issue_children(child, api)
                     end
                   end
                 end
               end
             end

app/models/issue_query.rb +41 -4

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 IssueQuery < Query
               self.queried_class = Issue
               self.available_columns = [
                 QueryColumn.new(:id, :sortable => "#{Issue.table_name}.id", :default_order => 'desc', :caption => '#', :frozen => true),
                 QueryColumn.new(:project, :sortable => "#{Project.table_name}.name", :groupable => true),
                 QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position", :groupable => true),
                 QueryColumn.new(:parent, :sortable => ["#{Issue.table_name}.root_id", "#{Issue.table_name}.lft ASC"], :default_order => 'desc', :caption => :field_parent_issue),
                 QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position", :groupable => true),
                 QueryColumn.new(:priority, :sortable => "#{IssuePriority.table_name}.position", :default_order => 'desc', :groupable => true),
                 QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
                 QueryColumn.new(:author, :sortable => lambda {User.fields_for_order_statement("authors")}, :groupable => true),
                 QueryColumn.new(:assigned_to, :sortable => lambda {User.fields_for_order_statement}, :groupable => true),
                 QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
                 QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name", :groupable => true),
                 QueryColumn.new(:fixed_version, :sortable => lambda {Version.fields_for_order_statement}, :groupable => true),
                 QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
                 QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
                 QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
                 QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio", :groupable => true),
                 QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
                 QueryColumn.new(:closed_on, :sortable => "#{Issue.table_name}.closed_on", :default_order => 'desc'),
                 QueryColumn.new(:relations, :caption => :label_related_issues),
                 QueryColumn.new(:description, :inline => false)
               ]
               scope :visible, lambda {|*args|
                 user = args.shift || User.current
                 base = Project.allowed_to_condition(user, :view_issues, *args)
-                user_id = user.logged? ? user.id : 0
+                scope = includes(:project).where("#{table_name}.project_id IS NULL OR (#{base})")
-                includes(:project).where("(#{table_name}.project_id IS NULL OR (#{base})) AND (#{table_name}.is_public = ? OR #{table_name}.user_id = ?)", true, user_id)
+                if user.admin?
+                  scope.where("#{table_name}.visibility <> ? OR #{table_name}.user_id = ?", VISIBILITY_PRIVATE, user.id)
+                elsif user.memberships.any?
+                  scope.where("#{table_name}.visibility = ?" +
+                    " OR (#{table_name}.visibility = ? AND #{table_name}.id IN (" +
+                      "SELECT DISTINCT q.id FROM #{table_name} q" +
+                      " INNER JOIN #{table_name_prefix}queries_roles#{table_name_suffix} qr on qr.query_id = q.id" +
+                      " INNER JOIN #{MemberRole.table_name} mr ON mr.role_id = qr.role_id" +
+                      " INNER JOIN #{Member.table_name} m ON m.id = mr.member_id AND m.user_id = ?" +
+                      " WHERE q.project_id IS NULL OR q.project_id = m.project_id))" +
+                    " OR #{table_name}.user_id = ?",
+                    VISIBILITY_PUBLIC, VISIBILITY_ROLES, user.id, user.id)
+                elsif user.logged?
+                  scope.where("#{table_name}.visibility = ? OR #{table_name}.user_id = ?", VISIBILITY_PUBLIC, user.id)
+                else
+                  scope.where("#{table_name}.visibility = ?", VISIBILITY_PUBLIC)
+                end
               }
               def initialize(attributes=nil, *args)
                 super attributes
                 self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
               end
               # Returns true if the query is visible to +user+ or the current user.
               def visible?(user=User.current)
-                (project.nil? || user.allowed_to?(:view_issues, project)) && (self.is_public? || self.user_id == user.id)
+                return true if user.admin?
+                return false unless project.nil? || user.allowed_to?(:view_issues, project)
+                case visibility
+                when VISIBILITY_PUBLIC
+                  true
+                when VISIBILITY_ROLES
+                  if project
+                    (user.roles_for_project(project) & roles).any?
+                  else
+                    Member.where(:user_id => user.id).joins(:roles).where(:member_roles => {:role_id => roles.map(&:id)}).any?
+                  end
+                else
+                  user == self.user
+                end
+              end
+              def is_private?
+                visibility == VISIBILITY_PRIVATE
+              end
+              def is_public?
+                !is_private?
               end
               def initialize_available_filters
                 principals = []
                 subprojects = []
                 versions = []
                 categories = []
                 issue_custom_fields = []
                 if project
                   principals += project.principals.sort
                   unless project.leaf?
                     subprojects = project.descendants.visible.all
                     principals += Principal.member_of(subprojects)
                   end
                   versions = project.shared_versions.all
                   categories = project.issue_categories.all
                   issue_custom_fields = project.all_issue_custom_fields
                 else
                   if all_projects.any?
                     principals += Principal.member_of(all_projects)
                   end
                   versions = Version.visible.find_all_by_sharing('system')
                   issue_custom_fields = IssueCustomField.where(:is_for_all => true)
                 end
                 principals.uniq!
                 principals.sort!
                 users = principals.select {|p| p.is_a?(User)}
                 add_available_filter "status_id",
                   :type => :list_status, :values => IssueStatus.sorted.all.collect{|s| [s.name, s.id.to_s] }
                 if project.nil?
                   project_values = []
                   if User.current.logged? && User.current.memberships.any?
                     project_values << ["<< #{l(:label_my_projects).downcase} >>", "mine"]
                   end
                   project_values += all_projects_values
                   add_available_filter("project_id",
                     :type => :list, :values => project_values
                   ) unless project_values.empty?
                 end
                 add_available_filter "tracker_id",
                   :type => :list, :values => trackers.collect{|s| [s.name, s.id.to_s] }
                 add_available_filter "priority_id",
                   :type => :list, :values => IssuePriority.all.collect{|s| [s.name, s.id.to_s] }
                 author_values = []
                 author_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 author_values += users.collect{|s| [s.name, s.id.to_s] }
                 add_available_filter("author_id",
                   :type => :list, :values => author_values
                 ) unless author_values.empty?
                 assigned_to_values = []
                 assigned_to_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
                 assigned_to_values += (Setting.issue_group_assignment? ?
                                           principals : users).collect{|s| [s.name, s.id.to_s] }
                 add_available_filter("assigned_to_id",
                   :type => :list_optional, :values => assigned_to_values
                 ) unless assigned_to_values.empty?
                 group_values = Group.all.collect {|g| [g.name, g.id.to_s] }
                 add_available_filter("member_of_group",
                   :type => :list_optional, :values => group_values
                 ) unless group_values.empty?
                 role_values = Role.givable.collect {|r| [r.name, r.id.to_s] }
                 add_available_filter("assigned_to_role",
                   :type => :list_optional, :values => role_values
                 ) unless role_values.empty?
                 if versions.any?
                   add_available_filter "fixed_version_id",
                     :type => :list_optional,
                     :values => versions.sort.collect{|s| ["#{s.project.name} - #{s.name}", s.id.to_s] }
                 end
                 if categories.any?
                   add_available_filter "category_id",
                     :type => :list_optional,
                     :values => categories.collect{|s| [s.name, s.id.to_s] }
                 end
                 add_available_filter "subject", :type => :text
                 add_available_filter "created_on", :type => :date_past
                 add_available_filter "updated_on", :type => :date_past
                 add_available_filter "closed_on", :type => :date_past
                 add_available_filter "start_date", :type => :date
                 add_available_filter "due_date", :type => :date
                 add_available_filter "estimated_hours", :type => :float
                 add_available_filter "done_ratio", :type => :integer
                 if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
                   User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
                   add_available_filter "is_private",
                     :type => :list,
                     :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]]
                 end
                 if User.current.logged?
                   add_available_filter "watcher_id",
                     :type => :list, :values => [["<< #{l(:label_me)} >>", "me"]]
                 end
                 if subprojects.any?
                   add_available_filter "subproject_id",
                     :type => :list_subprojects,
                     :values => subprojects.collect{|s| [s.name, s.id.to_s] }
                 end
                 add_custom_fields_filters(issue_custom_fields)
                 add_associations_custom_fields_filters :project, :author, :assigned_to, :fixed_version
                 IssueRelation::TYPES.each do |relation_type, options|
                   add_available_filter relation_type, :type => :relation, :label => options[:name]
                 end
                 Tracker.disabled_core_fields(trackers).each {|field|
                   delete_available_filter field
                 }
               end
               def available_columns
                 return @available_columns if @available_columns
                 @available_columns = self.class.available_columns.dup
                 @available_columns += (project ?
                                         project.all_issue_custom_fields :
                                         IssueCustomField.all
                                        ).collect {|cf| QueryCustomFieldColumn.new(cf) }
                 if User.current.allowed_to?(:view_time_entries, project, :global => true)
                   index = nil
                   @available_columns.each_with_index {|column, i| index = i if column.name == :estimated_hours}
                   index = (index ? index + 1 : -1)
                   # insert the column after estimated_hours or at the end
                   @available_columns.insert index, QueryColumn.new(:spent_hours,
                     :sortable => "COALESCE((SELECT SUM(hours) FROM #{TimeEntry.table_name} WHERE #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id), 0)",
                     :default_order => 'desc',
                     :caption => :label_spent_time
                   )
                 end
                 if User.current.allowed_to?(:set_issues_private, nil, :global => true) ||
                   User.current.allowed_to?(:set_own_issues_private, nil, :global => true)
                   @available_columns << QueryColumn.new(:is_private, :sortable => "#{Issue.table_name}.is_private")
                 end
                 disabled_fields = Tracker.disabled_core_fields(trackers).map {|field| field.sub(/_id$/, '')}
                 @available_columns.reject! {|column|
                   disabled_fields.include?(column.name.to_s)
                 }
                 @available_columns
               end
               def default_columns_names
                 @default_columns_names ||= begin
                   default_columns = Setting.issue_list_default_columns.map(&:to_sym)
                   project.present? ? default_columns : [:project] | default_columns
                 end
               end
               # Returns the issue count
               def issue_count
                 Issue.visible.joins(:status, :project).where(statement).count
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issue count by group or nil if query is not grouped
               def issue_count_by_group
                 r = nil
                 if grouped?
                   begin
                     # Rails3 will raise an (unexpected) RecordNotFound if there's only a nil group value
                     r = Issue.visible.
                       joins(:status, :project).
                       where(statement).
                       joins(joins_for_order_statement(group_by_statement)).
                       group(group_by_statement).
                       count
                   rescue ActiveRecord::RecordNotFound
                     r = {nil => issue_count}
                   end
                   c = group_by_column
                   if c.is_a?(QueryCustomFieldColumn)
                     r = r.keys.inject({}) {|h, k| h[c.custom_field.cast_value(k)] = r[k]; h}
                   end
                 end
                 r
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issues
               # Valid options are :order, :offset, :limit, :include, :conditions
               def issues(options={})
                 order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
                 issues = Issue.visible.
                   joins(:status, :project).
                   where(statement).
                   includes(([:status, :project] + (options[:include] || [])).uniq).
                   where(options[:conditions]).
                   order(order_option).
                   joins(joins_for_order_statement(order_option.join(','))).
                   limit(options[:limit]).
                   offset(options[:offset]).
                   all
                 if has_column?(:spent_hours)
                   Issue.load_visible_spent_hours(issues)
                 end
                 if has_column?(:relations)
                   Issue.load_visible_relations(issues)
                 end
                 issues
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the issues ids
               def issue_ids(options={})
                 order_option = [group_by_sort_order, options[:order]].flatten.reject(&:blank?)
                 Issue.visible.
                   joins(:status, :project).
                   where(statement).
                   includes(([:status, :project] + (options[:include] || [])).uniq).
                   where(options[:conditions]).
                   order(order_option).
                   joins(joins_for_order_statement(order_option.join(','))).
                   limit(options[:limit]).
                   offset(options[:offset]).
                   find_ids
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the journals
               # Valid options are :order, :offset, :limit
               def journals(options={})
                 Journal.visible.
                   joins(:issue => [:project, :status]).
                   where(statement).
                   order(options[:order]).
                   limit(options[:limit]).
                   offset(options[:offset]).
                   preload(:details, :user, {:issue => [:project, :author, :tracker, :status]}).
                   all
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               # Returns the versions
               # Valid options are :conditions
               def versions(options={})
                 Version.visible.
                   where(project_statement).
                   where(options[:conditions]).
                   includes(:project).
                   all
               rescue ::ActiveRecord::StatementInvalid => e
                 raise StatementInvalid.new(e.message)
               end
               def sql_for_watcher_id_field(field, operator, value)
                 db_table = Watcher.table_name
                 "#{Issue.table_name}.id #{ operator == '=' ? 'IN' : 'NOT IN' } (SELECT #{db_table}.watchable_id FROM #{db_table} WHERE #{db_table}.watchable_type='Issue' AND " +
                   sql_for_field(field, '=', value, db_table, 'user_id') + ')'
               end
               def sql_for_member_of_group_field(field, operator, value)
                 if operator == '*' # Any group
                   groups = Group.all
                   operator = '=' # Override the operator since we want to find by assigned_to
                 elsif operator == "!*"
                   groups = Group.all
                   operator = '!' # Override the operator since we want to find by assigned_to
                 else
                   groups = Group.find_all_by_id(value)
                 end
                 groups ||= []
                 members_of_groups = groups.inject([]) {|user_ids, group|
                   user_ids + group.user_ids + [group.id]
                 }.uniq.compact.sort.collect(&:to_s)
                 '(' + sql_for_field("assigned_to_id", operator, members_of_groups, Issue.table_name, "assigned_to_id", false) + ')'
               end
               def sql_for_assigned_to_role_field(field, operator, value)
                 case operator
                 when "*", "!*" # Member / Not member
                   sw = operator == "!*" ? 'NOT' : ''
                   nl = operator == "!*" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
                   "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}" +
                     " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id))"
                 when "=", "!"
                   role_cond = value.any? ?
                     "#{MemberRole.table_name}.role_id IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")" :
                     "1=0"
                   sw = operator == "!" ? 'NOT' : ''
                   nl = operator == "!" ? "#{Issue.table_name}.assigned_to_id IS NULL OR" : ''
                   "(#{nl} #{Issue.table_name}.assigned_to_id #{sw} IN (SELECT DISTINCT #{Member.table_name}.user_id FROM #{Member.table_name}, #{MemberRole.table_name}" +
                     " WHERE #{Member.table_name}.project_id = #{Issue.table_name}.project_id AND #{Member.table_name}.id = #{MemberRole.table_name}.member_id AND #{role_cond}))"
                 end
               end
               def sql_for_is_private_field(field, operator, value)
                 op = (operator == "=" ? 'IN' : 'NOT IN')
                 va = value.map {|v| v == '0' ? connection.quoted_false : connection.quoted_true}.uniq.join(',')
                 "#{Issue.table_name}.is_private #{op} (#{va})"
               end
               def sql_for_relations(field, operator, value, options={})
                 relation_options = IssueRelation::TYPES[field]
                 return relation_options unless relation_options
                 relation_type = field
                 join_column, target_join_column = "issue_from_id", "issue_to_id"
                 if relation_options[:reverse] || options[:reverse]
                   relation_type = relation_options[:reverse] || relation_type
                   join_column, target_join_column = target_join_column, join_column
                 end
                 sql = case operator
                   when "*", "!*"
                     op = (operator == "*" ? 'IN' : 'NOT IN')
                     "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}')"
                   when "=", "!"
                     op = (operator == "=" ? 'IN' : 'NOT IN')
                     "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name} WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = #{value.first.to_i})"
                   when "=p", "=!p", "!p"
                     op = (operator == "!p" ? 'NOT IN' : 'IN')
                     comp = (operator == "=!p" ? '<>' : '=')
                     "#{Issue.table_name}.id #{op} (SELECT DISTINCT #{IssueRelation.table_name}.#{join_column} FROM #{IssueRelation.table_name}, #{Issue.table_name} relissues WHERE #{IssueRelation.table_name}.relation_type = '#{connection.quote_string(relation_type)}' AND #{IssueRelation.table_name}.#{target_join_column} = relissues.id AND relissues.project_id #{comp} #{value.first.to_i})"
                   end
                 if relation_options[:sym] == field && !options[:reverse]
                   sqls = [sql, sql_for_relations(field, operator, value, :reverse => true)]
                   sqls.join(["!", "!*", "!p"].include?(operator) ? " AND " : " OR ")
                 else
                   sql
                 end
               end
               IssueRelation::TYPES.keys.each do |relation_type|
                 alias_method "sql_for_#{relation_type}_field".to_sym, :sql_for_relations
               end
             end

app/models/query.rb +17 -2

             # Redmine - project management software
             # Copyright (C) 2006-2013  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 QueryColumn
               attr_accessor :name, :sortable, :groupable, :default_order
               include Redmine::I18n
               def initialize(name, options={})
                 self.name = name
                 self.sortable = options[:sortable]
                 self.groupable = options[:groupable] || false
                 if groupable == true
                   self.groupable = name.to_s
                 end
                 self.default_order = options[:default_order]
                 @inline = options.key?(:inline) ? options[:inline] : true
                 @caption_key = options[:caption] || "field_#{name}".to_sym
                 @frozen = options[:frozen]
               end
               def caption
                 @caption_key.is_a?(Symbol) ? l(@caption_key) : @caption_key
               end
               # Returns true if the column is sortable, otherwise false
               def sortable?
                 !@sortable.nil?
               end
               def sortable
                 @sortable.is_a?(Proc) ? @sortable.call : @sortable
               end
               def inline?
                 @inline
               end
               def frozen?
                 @frozen
               end
               def value(object)
                 object.send name
               end
               def css_classes
                 name
               end
             end
             class QueryCustomFieldColumn < QueryColumn
               def initialize(custom_field)
                 self.name = "cf_#{custom_field.id}".to_sym
                 self.sortable = custom_field.order_statement || false
                 self.groupable = custom_field.group_statement || false
                 @inline = true
                 @cf = custom_field
               end
               def caption
                 @cf.name
               end
               def custom_field
                 @cf
               end
               def value(object)
                 cv = object.custom_values.select {|v| v.custom_field_id == @cf.id}.collect {|v| @cf.cast_value(v.value)}
                 cv.size > 1 ? cv.sort {|a,b| a.to_s <=> b.to_s} : cv.first
               end
               def css_classes
                 @css_classes ||= "#{name} #{@cf.field_format}"
               end
             end
             class QueryAssociationCustomFieldColumn < QueryCustomFieldColumn
               def initialize(association, custom_field)
                 super(custom_field)
                 self.name = "#{association}.cf_#{custom_field.id}".to_sym
                 # TODO: support sorting/grouping by association custom field
                 self.sortable = false
                 self.groupable = false
                 @association = association
               end
               def value(object)
                 if assoc = object.send(@association)
                   super(assoc)
                 end
               end
               def css_classes
                 @css_classes ||= "#{@association}_cf_#{@cf.id} #{@cf.field_format}"
               end
             end
             class Query < ActiveRecord::Base
               class StatementInvalid < ::ActiveRecord::StatementInvalid
               end
+              VISIBILITY_PRIVATE = 0
+              VISIBILITY_ROLES   = 1
+              VISIBILITY_PUBLIC  = 2
               belongs_to :project
               belongs_to :user
+              has_and_belongs_to_many :roles, :join_table => "#{table_name_prefix}queries_roles#{table_name_suffix}", :foreign_key => "query_id"
               serialize :filters
               serialize :column_names
               serialize :sort_criteria, Array
               attr_protected :project_id, :user_id
               validates_presence_of :name
               validates_length_of :name, :maximum => 255
+              validates :visibility, :inclusion => { :in => [VISIBILITY_PUBLIC, VISIBILITY_ROLES, VISIBILITY_PRIVATE] }
               validate :validate_query_filters
+              validate do |query|
+                errors.add(:base, l(:label_role_plural) + ' ' + l('activerecord.errors.messages.blank')) if query.visibility == VISIBILITY_ROLES && roles.blank?
+              end
+              after_save do |query|
+                if query.visibility_changed? && query.visibility != VISIBILITY_ROLES
+            	    query.roles.clear
+            	  end
+              end
               class_attribute :operators
               self.operators = {
                 "="   => :label_equals,
                 "!"   => :label_not_equals,
                 "o"   => :label_open_issues,
                 "c"   => :label_closed_issues,
                 "!*"  => :label_none,
                 "*"   => :label_any,
                 ">="  => :label_greater_or_equal,
                 "<="  => :label_less_or_equal,
                 "><"  => :label_between,
                 "<t+" => :label_in_less_than,
                 ">t+" => :label_in_more_than,
                 "><t+"=> :label_in_the_next_days,
                 "t+"  => :label_in,
                 "t"   => :label_today,
                 "ld"  => :label_yesterday,
                 "w"   => :label_this_week,
                 "lw"  => :label_last_week,
                 "l2w" => [:label_last_n_weeks, {:count => 2}],
                 "m"   => :label_this_month,
                 "lm"  => :label_last_month,
                 "y"   => :label_this_year,
                 ">t-" => :label_less_than_ago,
                 "<t-" => :label_more_than_ago,
                 "><t-"=> :label_in_the_past_days,
                 "t-"  => :label_ago,
                 "~"   => :label_contains,
                 "!~"  => :label_not_contains,
                 "=p"  => :label_any_issues_in_project,
                 "=!p" => :label_any_issues_not_in_project,
                 "!p"  => :label_no_issues_in_project
               }
               class_attribute :operators_by_filter_type
               self.operators_by_filter_type = {
                 :list => [ "=", "!" ],
                 :list_status => [ "o", "=", "!", "c", "*" ],
                 :list_optional => [ "=", "!", "!*", "*" ],
                 :list_subprojects => [ "*", "!*", "=" ],
                 :date => [ "=", ">=", "<=", "><", "<t+", ">t+", "><t+", "t+", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", ">t-", "<t-", "><t-", "t-", "!*", "*" ],
                 :date_past => [ "=", ">=", "<=", "><", ">t-", "<t-", "><t-", "t-", "t", "ld", "w", "lw", "l2w", "m", "lm", "y", "!*", "*" ],
                 :string => [ "=", "~", "!", "!~", "!*", "*" ],
                 :text => [  "~", "!~", "!*", "*" ],
                 :integer => [ "=", ">=", "<=", "><", "!*", "*" ],
                 :float => [ "=", ">=", "<=", "><", "!*", "*" ],
                 :relation => ["=", "=p", "=!p", "!p", "!*", "*"]
               }
               class_attribute :available_columns
               self.available_columns = []
               class_attribute :queried_class
               def queried_table_name
                 @queried_table_name ||= self.class.queried_class.table_name
               end
               def initialize(attributes=nil, *args)
                 super attributes
                 @is_for_all = project.nil?
               end
               # Builds the query from the given params
               def build_from_params(params)
                 if params[:fields] || params[:f]
                   self.filters = {}
                   add_filters(params[:fields] || params[:f], params[:operators] || params[:op], params[:values] || params[:v])
                 else
                   available_filters.keys.each do |field|
                     add_short_filter(field, params[field]) if params[field]
                   end
                 end
                 self.group_by = params[:group_by] || (params[:query] && params[:query][:group_by])
                 self.column_names = params[:c] || (params[:query] && params[:query][:column_names])
                 self
               end
               # Builds a new query from the given params and attributes
               def self.build_from_params(params, attributes={})
                 new(attributes).build_from_params(params)
               end
               def validate_query_filters
                 filters.each_key do |field|
                   if values_for(field)
                     case type_for(field)
                     when :integer
                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+$/) }
                     when :float
                       add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^[+-]?\d+(\.\d*)?$/) }
                     when :date, :date_past
                       case operator_for(field)
                       when "=", ">=", "<=", "><"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && (!v.match(/^\d{4}-\d{2}-\d{2}$/) || (Date.parse(v) rescue nil).nil?) }
                       when ">t-", "<t-", "t-", ">t+", "<t+", "t+", "><t+", "><t-"
                         add_filter_error(field, :invalid) if values_for(field).detect {|v| v.present? && !v.match(/^\d+$/) }
                       end
                     end
                   end
                   add_filter_error(field, :blank) unless
                       # filter requires one or more values
                       (values_for(field) and !values_for(field).first.blank?) or
                       # filter doesn't require any value
                       ["o", "c", "!*", "*", "t", "ld", "w", "lw", "l2w", "m", "lm", "y"].include? operator_for(field)
                 end if filters
               end
               def add_filter_error(field, message)
                 m = label_for(field) + " " + l(message, :scope => 'activerecord.errors.messages')
                 errors.add(:base, m)
               end
               def editable_by?(user)
                 return false unless user
                 # Admin can edit them all and regular users can edit their private queries
-                return true if user.admin? || (!is_public && self.user_id == user.id)
+                return true if user.admin? || (is_private? && self.user_id == user.id)
                 # Members can not edit public queries that are for all project (only admin is allowed to)
-                is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
+                is_public? && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
               end
               def trackers
                 @trackers ||= project.nil? ? Tracker.sorted.all : project.rolled_up_trackers
               end
               # Returns a hash of localized labels for all filter operators
               def self.operators_labels
                 operators.inject({}) {|h, operator| h[operator.first] = l(*operator.last); h}
               end
               # Returns a representation of the available filters for JSON serialization
               def available_filters_as_json
                 json = {}
                 available_filters.each do |field, options|
                   json[field] = options.slice(:type, :name, :values).stringify_keys
                 end
                 json
               end
               def all_projects
                 @all_projects ||= Project.visible.all
               end
               def all_projects_values
                 return @all_projects_values if @all_projects_values
                 values = []
                 Project.project_tree(all_projects) do |p, level|
                   prefix = (level > 0 ? ('--' * level + ' ') : '')
                   values << ["#{prefix}#{p.name}", p.id.to_s]
                 end
                 @all_projects_values = values
               end
               # Adds available filters
               def initialize_available_filters
                 # implemented by sub-classes
               end
               protected :initialize_available_filters
               # Adds an available filter
               def add_available_filter(field, options)
                 @available_filters ||= ActiveSupport::OrderedHash.new
                 @available_filters[field] = options
                 @available_filters
               end
               # Removes an available filter
               def delete_available_filter(field)
                 if @available_filters
                   @available_filters.delete(field)
                 end
               end
               # Return a hash of available filters
               def available_filters
                 unless @available_filters
                   initialize_available_filters
                   @available_filters.each do |field, options|
                     options[:name] ||= l(options[:label] || "field_#{field}".gsub(/_id$/, ''))
                   end
                 end
                 @available_filters
               end
               def add_filter(field, operator, values=nil)
                 # values must be an array
                 return unless values.nil? || values.is_a?(Array)
                 # check if field is defined as an available filter
                 if available_filters.has_key? field
                   filter_options = available_filters[field]
                   filters[field] = {:operator => operator, :values => (values || [''])}
                 end
               end
               def add_short_filter(field, expression)
                 return unless expression && available_filters.has_key?(field)
                 field_type = available_filters[field][:type]
                 operators_by_filter_type[field_type].sort.reverse.detect do |operator|
                   next unless expression =~ /^#{Regexp.escape(operator)}(.*)$/
                   values = $1
                   add_filter field, operator, values.present? ? values.split('|') : ['']
                 end || add_filter(field, '=', expression.split('|'))
               end
               # Add multiple filters using +add_filter+
               def add_filters(fields, operators, values)
                 if fields.is_a?(Array) && operators.is_a?(Hash) && (values.nil? || values.is_a?(Hash))
                   fields.each do |field|
                     add_filter(field, operators[field], values && values[field])
                   end
                 end
               end
               def has_filter?(field)
                 filters and filters[field]
               end
               def type_for(field)
                 available_filters[field][:type] if available_filters.has_key?(field)
               end
               def operator_for(field)
                 has_filter?(field) ? filters[field][:operator] : nil
               end
               def values_for(field)
                 has_filter?(field) ? filters[field][:values] : nil
               end
               def value_for(field, index=0)
                 (values_for(field) || [])[index]
               end
               def label_for(field)
                 label = available_filters[field][:name] if available_filters.has_key?(field)
                 label ||= l("field_#{field.to_s.gsub(/_id$/, '')}", :default => field)
               end
               def self.add_available_column(column)
                 self.available_columns << (column) if column.is_a?(QueryColumn)
               end
               # Returns an array of columns that can be used to group the results
               def groupable_columns
                 available_columns.select {|c| c.groupable}
               end
               # Returns a Hash of columns and the key for sorting
               def sortable_columns
                 available_columns.inject({}) {|h, column|
                   h[column.name.to_s] = column.sortable
                   h
                 }
               end
               def columns
                 # preserve the column_names order
                 cols = (has_default_columns? ? default_columns_names : column_names).collect do |name|
                    available_columns.find { |col| col.name == name }
                 end.compact
                 available_columns.select(&:frozen?) | cols
               end
               def inline_columns
                 columns.select(&:inline?)
               end
               def block_columns
                 columns.reject(&:inline?)
               end
               def available_inline_columns
                 available_columns.select(&:inline?)
               end
               def available_block_columns
                 available_columns.reject(&:inline?)
               end
               def default_columns_names
                 []
               end
               def column_names=(names)
                 if names
                   names = names.select {|n| n.is_a?(Symbol) || !n.blank? }
                   names = names.collect {|n| n.is_a?(Symbol) ? n : n.to_sym }
                   # Set column_names to nil if default columns
                   if names == default_columns_names
                     names = nil
                   end
                 end
                 write_attribute(:column_names, names)
               end
               def has_column?(column)
                 column_names && column_names.include?(column.is_a?(QueryColumn) ? column.name : column)
               end
               def has_default_columns?
                 column_names.nil? || column_names.empty?
               end
               def sort_criteria=(arg)
                 c = []
                 if arg.is_a?(Hash)
                   arg = arg.keys.sort.collect {|k| arg[k]}
                 end
                 c = arg.select {|k,o| !k.to_s.blank?}.slice(0,3).collect {|k,o| [k.to_s, (o == 'desc' || o == false) ? 'desc' : 'asc']}
                 write_attribute(:sort_criteria, c)
               end
               def sort_criteria
                 read_attribute(:sort_criteria) || []
               end
               def sort_criteria_key(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].first
               end
               def sort_criteria_order(arg)
                 sort_criteria && sort_criteria[arg] && sort_criteria[arg].last
               end
               def sort_criteria_order_for(key)
                 sort_criteria.detect {|k, order| key.to_s == k}.try(:last)
               end
               # Returns the SQL sort order that should be prepended for grouping
               def group_by_sort_order
                 if grouped? && (column = group_by_column)
                   order = sort_criteria_order_for(column.name) || column.default_order
                   column.sortable.is_a?(Array) ?
                     column.sortable.collect {|s| "#{s} #{order}"}.join(',') :
                     "#{column.sortable} #{order}"
                 end
               end
               # Returns true if the query is a grouped query
               def grouped?
                 !group_by_column.nil?
               end
               def group_by_column
                 groupable_columns.detect {|c| c.groupable && c.name.to_s == group_by}
               end
               def group_by_statement
                 group_by_column.try(:groupable)
               end
               def project_statement
                 project_clauses = []
                 if project && !project.descendants.active.empty?
                   ids = [project.id]
                   if has_filter?("subproject_id")
                     case operator_for("subproject_id")
                     when '='
                       # include the selected subprojects
                       ids += values_for("subproject_id").each(&:to_i)
                     when '!*'
                       # main project only
                     else
                       # all subprojects
                       ids += project.descendants.collect(&:id)
                     end
                   elsif Setting.display_subprojects_issues?
                     ids += project.descendants.collect(&:id)
                   end
                   project_clauses << "#{Project.table_name}.id IN (%s)" % ids.join(',')
                 elsif project
                   project_clauses << "#{Project.table_name}.id = %d" % project.id
                 end
                 project_clauses.any? ? project_clauses.join(' AND ') : nil
               end
               def statement
                 # filters clauses
                 filters_clauses = []
                 filters.each_key do |field|
                   next if field == "subproject_id"
                   v = values_for(field).clone
                   next unless v and !v.empty?
                   operator = operator_for(field)
                   # "me" value subsitution
                   if %w(assigned_to_id author_id user_id watcher_id).include?(field)
                     if v.delete("me")
                       if User.current.logged?
                         v.push(User.current.id.to_s)
                         v += User.current.group_ids.map(&:to_s) if field == 'assigned_to_id'
                       else
                         v.push("0")
                       end
                     end
                   end
                   if field == 'project_id'
                     if v.delete('mine')
                       v += User.current.memberships.map(&:project_id).map(&:to_s)
                     end
                   end
                   if field =~ /cf_(\d+)$/
                     # custom field
                     filters_clauses << sql_for_custom_field(field, operator, v, $1)
                   elsif respond_to?("sql_for_#{field}_field")
                     # specific statement
                     filters_clauses << send("sql_for_#{field}_field", field, operator, v)
                   else
                     # regular field
                     filters_clauses << '(' + sql_for_field(field, operator, v, queried_table_name, field) + ')'
                   end
                 end if filters and valid?
                 filters_clauses << project_statement
                 filters_clauses.reject!(&:blank?)
                 filters_clauses.any? ? filters_clauses.join(' AND ') : nil
               end
               private
               def sql_for_custom_field(field, operator, value, custom_field_id)
                 db_table = CustomValue.table_name
                 db_field = 'value'
                 filter = @available_filters[field]
                 return nil unless filter
                 if filter[:format] == 'user'
                   if value.delete('me')
                     value.push User.current.id.to_s
                   end
                 end
                 not_in = nil
                 if operator == '!'
                   # Makes ! operator work for custom fields with multiple values
                   operator = '='
                   not_in = 'NOT'
                 end
                 customized_key = "id"
                 customized_class = queried_class
                 if field =~ /^(.+)\.cf_/
                   assoc = $1
                   customized_key = "#{assoc}_id"
                   customized_class = queried_class.reflect_on_association(assoc.to_sym).klass.base_class rescue nil
                   raise "Unknown #{queried_class.name} association #{assoc}" unless customized_class
                 end
                 where = sql_for_field(field, operator, value, db_table, db_field, true)
                 if operator =~ /[<>]/
                   where = "(#{where}) AND #{db_table}.#{db_field} <> ''"
                 end
                 "#{queried_table_name}.#{customized_key} #{not_in} IN (SELECT #{customized_class.table_name}.id FROM #{customized_class.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='#{customized_class}' AND #{db_table}.customized_id=#{customized_class.table_name}.id AND #{db_table}.custom_field_id=#{custom_field_id} WHERE #{where})"
               end
               # Helper method to generate the WHERE sql for a +field+, +operator+ and a +value+
               def sql_for_field(field, operator, value, db_table, db_field, is_custom_filter=false)
                 sql = ''
                 case operator
                 when "="
                   if value.any?
                     case type_for(field)
                     when :date, :date_past
                       sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), (Date.parse(value.first) rescue nil))
                     when :integer
                       if is_custom_filter
                         sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) = #{value.first.to_i})"
                       else
                         sql = "#{db_table}.#{db_field} = #{value.first.to_i}"
                       end
                     when :float
                       if is_custom_filter
                         sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5})"
                       else
                         sql = "#{db_table}.#{db_field} BETWEEN #{value.first.to_f - 1e-5} AND #{value.first.to_f + 1e-5}"
                       end
                     else
                       sql = "#{db_table}.#{db_field} IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
                     end
                   else
                     # IN an empty set
                     sql = "1=0"
                   end
                 when "!"
                   if value.any?
                     sql = "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + value.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
                   else
                     # NOT IN an empty set
                     sql = "1=1"
                   end
                 when "!*"
                   sql = "#{db_table}.#{db_field} IS NULL"
                   sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
                 when "*"
                   sql = "#{db_table}.#{db_field} IS NOT NULL"
                   sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
                 when ">="
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, (Date.parse(value.first) rescue nil), nil)
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) >= #{value.first.to_f})"
                     else
                       sql = "#{db_table}.#{db_field} >= #{value.first.to_f}"
                     end
                   end
                 when "<="
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, nil, (Date.parse(value.first) rescue nil))
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) <= #{value.first.to_f})"
                     else
                       sql = "#{db_table}.#{db_field} <= #{value.first.to_f}"
                     end
                   end
                 when "><"
                   if [:date, :date_past].include?(type_for(field))
                     sql = date_clause(db_table, db_field, (Date.parse(value[0]) rescue nil), (Date.parse(value[1]) rescue nil))
                   else
                     if is_custom_filter
                       sql = "(#{db_table}.#{db_field} <> '' AND CAST(CASE #{db_table}.#{db_field} WHEN '' THEN '0' ELSE #{db_table}.#{db_field} END AS decimal(30,3)) BETWEEN #{value[0].to_f} AND #{value[1].to_f})"
                     else
                       sql = "#{db_table}.#{db_field} BETWEEN #{value[0].to_f} AND #{value[1].to_f}"
                     end
                   end
                 when "o"
                   sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_false})" if field == "status_id"
                 when "c"
                   sql = "#{queried_table_name}.status_id IN (SELECT id FROM #{IssueStatus.table_name} WHERE is_closed=#{connection.quoted_true})" if field == "status_id"
                 when "><t-"
                   # between today - n days and today
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, 0)
                 when ">t-"
                   # >= today - n days
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, nil)
                 when "<t-"
                   # <= today - n days
                   sql = relative_date_clause(db_table, db_field, nil, - value.first.to_i)
                 when "t-"
                   # = n days in past
                   sql = relative_date_clause(db_table, db_field, - value.first.to_i, - value.first.to_i)
                 when "><t+"
                   # between today and today + n days
                   sql = relative_date_clause(db_table, db_field, 0, value.first.to_i)
                 when ">t+"
                   # >= today + n days
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, nil)
                 when "<t+"
                   # <= today + n days
                   sql = relative_date_clause(db_table, db_field, nil, value.first.to_i)
                 when "t+"
                   # = today + n days
                   sql = relative_date_clause(db_table, db_field, value.first.to_i, value.first.to_i)
                 when "t"
                   # = today
                   sql = relative_date_clause(db_table, db_field, 0, 0)
                 when "ld"
                   # = yesterday
                   sql = relative_date_clause(db_table, db_field, -1, -1)
                 when "w"
                   # = this week
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = Date.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago, - days_ago + 6)
                 when "lw"
                   # = last week
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = Date.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago - 7, - days_ago - 1)
                 when "l2w"
                   # = last 2 weeks
                   first_day_of_week = l(:general_first_day_of_week).to_i
                   day_of_week = Date.today.cwday
                   days_ago = (day_of_week >= first_day_of_week ? day_of_week - first_day_of_week : day_of_week + 7 - first_day_of_week)
                   sql = relative_date_clause(db_table, db_field, - days_ago - 14, - days_ago - 1)
                 when "m"
                   # = this month
                   date = Date.today
                   sql = date_clause(db_table, db_field, date.beginning_of_month, date.end_of_month)
                 when "lm"
                   # = last month
                   date = Date.today.prev_month
                   sql = date_clause(db_table, db_field, date.beginning_of_month, date.end_of_month)
                 when "y"
                   # = this year
                   date = Date.today
                   sql = date_clause(db_table, db_field, date.beginning_of_year, date.end_of_year)
                 when "~"
                   sql = "LOWER(#{db_table}.#{db_field}) LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                 when "!~"
                   sql = "LOWER(#{db_table}.#{db_field}) NOT LIKE '%#{connection.quote_string(value.first.to_s.downcase)}%'"
                 else
                   raise "Unknown query operator #{operator}"
                 end
                 return sql
               end
               # Adds a filter for the given custom field
               def add_custom_field_filter(field, assoc=nil)
                 case field.field_format
                 when "text"
                   options = { :type => :text }
                 when "list"
                   options = { :type => :list_optional, :values => field.possible_values }
                 when "date"
                   options = { :type => :date }
                 when "bool"
                   options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]] }
                 when "int"
                   options = { :type => :integer }
                 when "float"
                   options = { :type => :float }
                 when "user", "version"
                   return unless project
                   values = field.possible_values_options(project)
                   if User.current.logged? && field.field_format == 'user'
                     values.unshift ["<< #{l(:label_me)} >>", "me"]
                   end
                   options = { :type => :list_optional, :values => values }
                 else
                   options = { :type => :string }
                 end
                 filter_id = "cf_#{field.id}"
                 filter_name = field.name
                 if assoc.present?
                   filter_id = "#{assoc}.#{filter_id}"
                   filter_name = l("label_attribute_of_#{assoc}", :name => filter_name)
                 end
                 add_available_filter filter_id, options.merge({
                   :name => filter_name,
                   :format => field.field_format,
                   :field => field
                 })
               end
               # Adds filters for the given custom fields scope
               def add_custom_fields_filters(scope, assoc=nil)
                 scope.where(:is_filter => true).sorted.each do |field|
                   add_custom_field_filter(field, assoc)
                 end
               end
               # Adds filters for the given associations custom fields
               def add_associations_custom_fields_filters(*associations)
                 fields_by_class = CustomField.where(:is_filter => true).group_by(&:class)
                 associations.each do |assoc|
                   association_klass = queried_class.reflect_on_association(assoc).klass
                   fields_by_class.each do |field_class, fields|
                     if field_class.customized_class <= association_klass
                       fields.sort.each do |field|
                         add_custom_field_filter(field, assoc)
                       end
                     end
                   end
                 end
               end
               # Returns a SQL clause for a date or datetime field.
               def date_clause(table, field, from, to)
                 s = []
                 if from
                   from_yesterday = from - 1
                   from_yesterday_time = Time.local(from_yesterday.year, from_yesterday.month, from_yesterday.day)
                   if self.class.default_timezone == :utc
                     from_yesterday_time = from_yesterday_time.utc
                   end
                   s << ("#{table}.#{field} > '%s'" % [connection.quoted_date(from_yesterday_time.end_of_day)])
                 end
                 if to
                   to_time = Time.local(to.year, to.month, to.day)
                   if self.class.default_timezone == :utc
                     to_time = to_time.utc
                   end
                   s << ("#{table}.#{field} <= '%s'" % [connection.quoted_date(to_time.end_of_day)])
                 end
                 s.join(' AND ')
               end
               # Returns a SQL clause for a date or datetime field using relative dates.
               def relative_date_clause(table, field, days_from, days_to)
                 date_clause(table, field, (days_from ? Date.today + days_from : nil), (days_to ? Date.today + days_to : nil))
               end
               # Additional joins required for the given sort options
               def joins_for_order_statement(order_options)
                 joins = []
                 if order_options
                   if order_options.include?('authors')
                     joins << "LEFT OUTER JOIN #{User.table_name} authors ON authors.id = #{queried_table_name}.author_id"
                   end
                   order_options.scan(/cf_\d+/).uniq.each do |name|
                     column = available_columns.detect {|c| c.name.to_s == name}
                     join = column && column.custom_field.join_for_order_statement
                     if join
                       joins << join
                     end
                   end
                 end
                 joins.any? ? joins.join(' ') : nil
               end
             end

app/models/user.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             require "digest/sha1"
             class User < Principal
               include Redmine::SafeAttributes
               # Different ways of displaying/sorting users
               USER_FORMATS = {
                 :firstname_lastname => {
                     :string => '#{firstname} #{lastname}',
                     :order => %w(firstname lastname id),
                     :setting_order => 1
                   },
                 :firstname_lastinitial => {
                     :string => '#{firstname} #{lastname.to_s.chars.first}.',
                     :order => %w(firstname lastname id),
                     :setting_order => 2
                   },
                 :firstname => {
                     :string => '#{firstname}',
                     :order => %w(firstname id),
                     :setting_order => 3
                   },
                 :lastname_firstname => {
                     :string => '#{lastname} #{firstname}',
                     :order => %w(lastname firstname id),
                     :setting_order => 4
                   },
                 :lastname_coma_firstname => {
                     :string => '#{lastname}, #{firstname}',
                     :order => %w(lastname firstname id),
                     :setting_order => 5
                   },
                 :lastname => {
                     :string => '#{lastname}',
                     :order => %w(lastname id),
                     :setting_order => 6
                   },
                 :username => {
                     :string => '#{login}',
                     :order => %w(login id),
                     :setting_order => 7
                   },
               }
               MAIL_NOTIFICATION_OPTIONS = [
                 ['all', :label_user_mail_option_all],
                 ['selected', :label_user_mail_option_selected],
                 ['only_my_events', :label_user_mail_option_only_my_events],
                 ['only_assigned', :label_user_mail_option_only_assigned],
                 ['only_owner', :label_user_mail_option_only_owner],
                 ['none', :label_user_mail_option_none]
               ]
               has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                                :after_remove => Proc.new {|user, group| group.user_removed(user)}
               has_many :changesets, :dependent => :nullify
               has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
               has_one :rss_token, :class_name => 'Token', :conditions => "action='feeds'"
               has_one :api_token, :class_name => 'Token', :conditions => "action='api'"
               belongs_to :auth_source
               scope :logged, lambda { where("#{User.table_name}.status <> #{STATUS_ANONYMOUS}") }
               scope :status, lambda {|arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
               acts_as_customizable
               attr_accessor :password, :password_confirmation, :generate_password
               attr_accessor :last_before_login_on
               # Prevents unauthorized assignments
               attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
               LOGIN_LENGTH_LIMIT = 60
               MAIL_LENGTH_LIMIT = 60
               validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
               validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, :case_sensitive => false
               validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, :case_sensitive => false
               # Login must contain letters, numbers, underscores only
               validates_format_of :login, :with => /\A[a-z0-9_\-@\.]*\z/i
               validates_length_of :login, :maximum => LOGIN_LENGTH_LIMIT
               validates_length_of :firstname, :lastname, :maximum => 30
               validates_format_of :mail, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :allow_blank => true
               validates_length_of :mail, :maximum => MAIL_LENGTH_LIMIT, :allow_nil => true
               validates_confirmation_of :password, :allow_nil => true
               validates_inclusion_of :mail_notification, :in => MAIL_NOTIFICATION_OPTIONS.collect(&:first), :allow_blank => true
               validate :validate_password_length
               before_create :set_mail_notification
               before_save   :generate_password_if_needed, :update_hashed_password
               before_destroy :remove_references_before_destroy
               after_save :update_notified_project_ids
               scope :in_group, lambda {|group|
                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 where("#{User.table_name}.id IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
               }
               scope :not_in_group, lambda {|group|
                 group_id = group.is_a?(Group) ? group.id : group.to_i
                 where("#{User.table_name}.id NOT IN (SELECT gu.user_id FROM #{table_name_prefix}groups_users#{table_name_suffix} gu WHERE gu.group_id = ?)", group_id)
               }
               scope :sorted, lambda { order(*User.fields_for_order_statement)}
               def set_mail_notification
                 self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
                 true
               end
               def update_hashed_password
                 # update hashed_password if password was set
                 if self.password && self.auth_source_id.blank?
                   salt_password(password)
                 end
               end
               alias :base_reload :reload
               def reload(*args)
                 @name = nil
                 @projects_by_role = nil
                 @membership_by_project_id = nil
                 @notified_projects_ids = nil
                 @notified_projects_ids_changed = false
                 @builtin_role = nil
                 base_reload(*args)
               end
               def mail=(arg)
                 write_attribute(:mail, arg.to_s.strip)
               end
               def identity_url=(url)
                 if url.blank?
                   write_attribute(:identity_url, '')
                 else
                   begin
                     write_attribute(:identity_url, OpenIdAuthentication.normalize_identifier(url))
                   rescue OpenIdAuthentication::InvalidOpenId
                     # Invalid url, don't save
                   end
                 end
                 self.read_attribute(:identity_url)
               end
               # Returns the user that matches provided login and password, or nil
               def self.try_to_login(login, password, active_only=true)
                 login = login.to_s
                 password = password.to_s
                 # Make sure no one can sign in with an empty login or password
                 return nil if login.empty? || password.empty?
                 user = find_by_login(login)
                 if user
                   # user is already in local database
                   return nil unless user.check_password?(password)
                   return nil if !user.active? && active_only
                 else
                   # user is not yet registered, try to authenticate with available sources
                   attrs = AuthSource.authenticate(login, password)
                   if attrs
                     user = new(attrs)
                     user.login = login
                     user.language = Setting.default_language
                     if user.save
                       user.reload
                       logger.info("User '#{user.login}' created from external auth source: #{user.auth_source.type} - #{user.auth_source.name}") if logger && user.auth_source
                     end
                   end
                 end
                 user.update_column(:last_login_on, Time.now) if user && !user.new_record? && user.active?
                 user
               rescue => text
                 raise text
               end
               # Returns the user who matches the given autologin +key+ or nil
               def self.try_to_autologin(key)
                 user = Token.find_active_user('autologin', key, Setting.autologin.to_i)
                 if user
                   user.update_column(:last_login_on, Time.now)
                   user
                 end
               end
               def self.name_formatter(formatter = nil)
                 USER_FORMATS[formatter || Setting.user_format] || USER_FORMATS[:firstname_lastname]
               end
               # Returns an array of fields names than can be used to make an order statement for users
               # according to how user names are displayed
               # Examples:
               #
               #   User.fields_for_order_statement              => ['users.login', 'users.id']
               #   User.fields_for_order_statement('authors')   => ['authors.login', 'authors.id']
               def self.fields_for_order_statement(table=nil)
                 table ||= table_name
                 name_formatter[:order].map {|field| "#{table}.#{field}"}
               end
               # Return user's full name for display
               def name(formatter = nil)
                 f = self.class.name_formatter(formatter)
                 if formatter
                   eval('"' + f[:string] + '"')
                 else
                   @name ||= eval('"' + f[:string] + '"')
                 end
               end
               def active?
                 self.status == STATUS_ACTIVE
               end
               def registered?
                 self.status == STATUS_REGISTERED
               end
               def locked?
                 self.status == STATUS_LOCKED
               end
               def activate
                 self.status = STATUS_ACTIVE
               end
               def register
                 self.status = STATUS_REGISTERED
               end
               def lock
                 self.status = STATUS_LOCKED
               end
               def activate!
                 update_attribute(:status, STATUS_ACTIVE)
               end
               def register!
                 update_attribute(:status, STATUS_REGISTERED)
               end
               def lock!
                 update_attribute(:status, STATUS_LOCKED)
               end
               # Returns true if +clear_password+ is the correct user's password, otherwise false
               def check_password?(clear_password)
                 if auth_source_id.present?
                   auth_source.authenticate(self.login, clear_password)
                 else
                   User.hash_password("#{salt}#{User.hash_password clear_password}") == hashed_password
                 end
               end
               # Generates a random salt and computes hashed_password for +clear_password+
               # The hashed password is stored in the following form: SHA1(salt + SHA1(password))
               def salt_password(clear_password)
                 self.salt = User.generate_salt
                 self.hashed_password = User.hash_password("#{salt}#{User.hash_password clear_password}")
               end
               # Does the backend storage allow this user to change their password?
               def change_password_allowed?
                 return true if auth_source.nil?
                 return auth_source.allow_password_changes?
               end
               def generate_password?
                 generate_password == '1' || generate_password == true
               end
               # Generate and set a random password on given length
               def random_password(length=40)
                 chars = ("a".."z").to_a + ("A".."Z").to_a + ("0".."9").to_a
                 chars -= %w(0 O 1 l)
                 password = ''
                 length.times {|i| password << chars[SecureRandom.random_number(chars.size)] }
                 self.password = password
                 self.password_confirmation = password
                 self
               end
               def pref
                 self.preference ||= UserPreference.new(:user => self)
               end
               def time_zone
                 @time_zone ||= (self.pref.time_zone.blank? ? nil : ActiveSupport::TimeZone[self.pref.time_zone])
               end
               def wants_comments_in_reverse_order?
                 self.pref[:comments_sorting] == 'desc'
               end
               # Return user's RSS key (a 40 chars long string), used to access feeds
               def rss_key
                 if rss_token.nil?
                   create_rss_token(:action => 'feeds')
                 end
                 rss_token.value
               end
               # Return user's API key (a 40 chars long string), used to access the API
               def api_key
                 if api_token.nil?
                   create_api_token(:action => 'api')
                 end
                 api_token.value
               end
               # Return an array of project ids for which the user has explicitly turned mail notifications on
               def notified_projects_ids
                 @notified_projects_ids ||= memberships.select {|m| m.mail_notification?}.collect(&:project_id)
               end
               def notified_project_ids=(ids)
                 @notified_projects_ids_changed = true
                 @notified_projects_ids = ids
               end
               # Updates per project notifications (after_save callback)
               def update_notified_project_ids
                 if @notified_projects_ids_changed
                   ids = (mail_notification == 'selected' ? Array.wrap(notified_projects_ids).reject(&:blank?) : [])
                   members.update_all(:mail_notification => false)
                   members.where(:project_id => ids).update_all(:mail_notification => true) if ids.any?
                 end
               end
               private :update_notified_project_ids
               def valid_notification_options
                 self.class.valid_notification_options(self)
               end
               # Only users that belong to more than 1 project can select projects for which they are notified
               def self.valid_notification_options(user=nil)
                 # Note that @user.membership.size would fail since AR ignores
                 # :include association option when doing a count
                 if user.nil? || user.memberships.length < 1
                   MAIL_NOTIFICATION_OPTIONS.reject {|option| option.first == 'selected'}
                 else
                   MAIL_NOTIFICATION_OPTIONS
                 end
               end
               # Find a user account by matching the exact login and then a case-insensitive
               # version.  Exact matches will be given priority.
               def self.find_by_login(login)
                 if login.present?
                   login = login.to_s
                   # First look for an exact match
                   user = where(:login => login).all.detect {|u| u.login == login}
                   unless user
                     # Fail over to case-insensitive if none was found
                     user = where("LOWER(login) = ?", login.downcase).first
                   end
                   user
                 end
               end
               def self.find_by_rss_key(key)
                 Token.find_active_user('feeds', key)
               end
               def self.find_by_api_key(key)
                 Token.find_active_user('api', key)
               end
               # Makes find_by_mail case-insensitive
               def self.find_by_mail(mail)
                 where("LOWER(mail) = ?", mail.to_s.downcase).first
               end
               # Returns true if the default admin account can no longer be used
               def self.default_admin_account_changed?
                 !User.active.find_by_login("admin").try(:check_password?, "admin")
               end
               def to_s
                 name
               end
               CSS_CLASS_BY_STATUS = {
                 STATUS_ANONYMOUS  => 'anon',
                 STATUS_ACTIVE     => 'active',
                 STATUS_REGISTERED => 'registered',
                 STATUS_LOCKED     => 'locked'
               }
               def css_classes
                 "user #{CSS_CLASS_BY_STATUS[status]}"
               end
               # Returns the current day according to user's time zone
               def today
                 if time_zone.nil?
                   Date.today
                 else
                   Time.now.in_time_zone(time_zone).to_date
                 end
               end
               # Returns the day of +time+ according to user's time zone
               def time_to_date(time)
                 if time_zone.nil?
                   time.to_date
                 else
                   time.in_time_zone(time_zone).to_date
                 end
               end
               def logged?
                 true
               end
               def anonymous?
                 !logged?
               end
               # Returns user's membership for the given project
               # or nil if the user is not a member of project
               def membership(project)
                 project_id = project.is_a?(Project) ? project.id : project
                 @membership_by_project_id ||= Hash.new {|h, project_id|
                   h[project_id] = memberships.where(:project_id => project_id).first
                 }
                 @membership_by_project_id[project_id]
               end
               # Returns the user's bult-in role
               def builtin_role
                 @builtin_role ||= Role.non_member
               end
               # Return user's roles for project
               def roles_for_project(project)
                 roles = []
                 # No role on archived projects
                 return roles if project.nil? || project.archived?
                 if membership = membership(project)
                   roles = membership.roles
                 else
                   roles << builtin_role
                 end
                 roles
               end
               # Return true if the user is a member of project
               def member_of?(project)
                 projects.to_a.include?(project)
               end
               # Returns a hash of user's projects grouped by roles
               def projects_by_role
                 return @projects_by_role if @projects_by_role
                 @projects_by_role = Hash.new([])
                 memberships.each do |membership|
                   if membership.project
                     membership.roles.each do |role|
                       @projects_by_role[role] = [] unless @projects_by_role.key?(role)
                       @projects_by_role[role] << membership.project
                     end
                   end
                 end
                 @projects_by_role.each do |role, projects|
                   projects.uniq!
                 end
                 @projects_by_role
               end
               # Returns true if user is arg or belongs to arg
               def is_or_belongs_to?(arg)
                 if arg.is_a?(User)
                   self == arg
                 elsif arg.is_a?(Group)
                   arg.users.include?(self)
                 else
                   false
                 end
               end
               # Return true if the user is allowed to do the specified action on a specific context
               # Action can be:
               # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
               # * a permission Symbol (eg. :edit_project)
               # Context can be:
               # * a project : returns true if user is allowed to do the specified action on this project
               # * an array of projects : returns true if user is allowed on every project
               # * nil with options[:global] set : check if user has at least one role allowed for this action,
               #   or falls back to Non Member / Anonymous permissions depending if the user is logged
               def allowed_to?(action, context, options={}, &block)
                 if context && context.is_a?(Project)
                   return false unless context.allows_to?(action)
                   # Admin users are authorized for anything else
                   return true if admin?
                   roles = roles_for_project(context)
                   return false unless roles
                   roles.any? {|role|
                     (context.is_public? || role.member?) &&
                     role.allowed_to?(action) &&
                     (block_given? ? yield(role, self) : true)
                   }
                 elsif context && context.is_a?(Array)
                   if context.empty?
                     false
                   else
                     # Authorize if user is authorized on every element of the array
                     context.map {|project| allowed_to?(action, project, options, &block)}.reduce(:&)
                   end
                 elsif options[:global]
                   # Admin users are always authorized
                   return true if admin?
                   # authorize if user has at least one role that has this permission
                   roles = memberships.collect {|m| m.roles}.flatten.uniq
                   roles << (self.logged? ? Role.non_member : Role.anonymous)
                   roles.any? {|role|
                     role.allowed_to?(action) &&
                     (block_given? ? yield(role, self) : true)
                   }
                 else
                   false
                 end
               end
               # Is the user allowed to do the specified action on any project?
               # See allowed_to? for the actions and valid options.
               def allowed_to_globally?(action, options, &block)
                 allowed_to?(action, nil, options.reverse_merge(:global => true), &block)
               end
               # Returns true if the user is allowed to delete the user's own account
               def own_account_deletable?
                 Setting.unsubscribe? &&
                   (!admin? || User.active.where("admin = ? AND id <> ?", true, id).exists?)
               end
               safe_attributes 'login',
                 'firstname',
                 'lastname',
                 'mail',
                 'mail_notification',
                 'notified_project_ids',
                 'language',
                 'custom_field_values',
                 'custom_fields',
                 'identity_url'
               safe_attributes 'status',
                 'auth_source_id',
                 'generate_password',
                 :if => lambda {|user, current_user| current_user.admin?}
               safe_attributes 'group_ids',
                 :if => lambda {|user, current_user| current_user.admin? && !user.new_record?}
               # Utility method to help check if a user should be notified about an
               # event.
               #
               # TODO: only supports Issue events currently
               def notify_about?(object)
                 if mail_notification == 'all'
                   true
                 elsif mail_notification.blank? || mail_notification == 'none'
                   false
                 else
                   case object
                   when Issue
                     case mail_notification
                     when 'selected', 'only_my_events'
                       # user receives notifications for created/assigned issues on unselected projects
                       object.author == self || is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)
                     when 'only_assigned'
                       is_or_belongs_to?(object.assigned_to) || is_or_belongs_to?(object.assigned_to_was)
                     when 'only_owner'
                       object.author == self
                     end
                   when News
                     # always send to project members except when mail_notification is set to 'none'
                     true
                   end
                 end
               end
               def self.current=(user)
                 Thread.current[:current_user] = user
               end
               def self.current
                 Thread.current[:current_user] ||= User.anonymous
               end
               # Returns the anonymous user.  If the anonymous user does not exist, it is created.  There can be only
               # one anonymous user per database.
               def self.anonymous
                 anonymous_user = AnonymousUser.first
                 if anonymous_user.nil?
                   anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
                   raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
                 end
                 anonymous_user
               end
               # Salts all existing unsalted passwords
               # It changes password storage scheme from SHA1(password) to SHA1(salt + SHA1(password))
               # This method is used in the SaltPasswords migration and is to be kept as is
               def self.salt_unsalted_passwords!
                 transaction do
                   User.where("salt IS NULL OR salt = ''").find_each do |user|
                     next if user.hashed_password.blank?
                     salt = User.generate_salt
                     hashed_password = User.hash_password("#{salt}#{user.hashed_password}")
                     User.where(:id => user.id).update_all(:salt => salt, :hashed_password => hashed_password)
                   end
                 end
               end
               protected
               def validate_password_length
                 return if password.blank? && generate_password?
                 # Password length validation based on setting
                 if !password.nil? && password.size < Setting.password_min_length.to_i
                   errors.add(:password, :too_short, :count => Setting.password_min_length.to_i)
                 end
               end
               private
               def generate_password_if_needed
                 if generate_password? && auth_source.nil?
                   length = [Setting.password_min_length.to_i + 2, 10].max
                   random_password(length)
                 end
               end
               # Removes references that are not handled by associations
               # Things that are not deleted are reassociated with the anonymous user
               def remove_references_before_destroy
                 return if self.id.nil?
                 substitute = User.anonymous
                 Attachment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 Comment.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 Issue.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 Issue.update_all 'assigned_to_id = NULL', ['assigned_to_id = ?', id]
                 Journal.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
                 JournalDetail.update_all ['old_value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND old_value = ?", id.to_s]
                 JournalDetail.update_all ['value = ?', substitute.id.to_s], ["property = 'attr' AND prop_key = 'assigned_to_id' AND value = ?", id.to_s]
                 Message.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 News.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 # Remove private queries and keep public ones
-                ::Query.delete_all ['user_id = ? AND is_public = ?', id, false]
+                ::Query.delete_all ['user_id = ? AND visibility = ?', id, ::Query::VISIBILITY_PRIVATE]
                 ::Query.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
                 TimeEntry.update_all ['user_id = ?', substitute.id], ['user_id = ?', id]
                 Token.delete_all ['user_id = ?', id]
                 Watcher.delete_all ['user_id = ?', id]
                 WikiContent.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
                 WikiContent::Version.update_all ['author_id = ?', substitute.id], ['author_id = ?', id]
               end
               # Return password digest
               def self.hash_password(clear_password)
                 Digest::SHA1.hexdigest(clear_password || "")
               end
               # Returns a 128bits random salt as a hex string (32 chars long)
               def self.generate_salt
                 Redmine::Utils.random_hex(16)
               end
             end
             class AnonymousUser < User
               validate :validate_anonymous_uniqueness, :on => :create
               def validate_anonymous_uniqueness
                 # There should be only one AnonymousUser in the database
                 errors.add :base, 'An anonymous user already exists.' if AnonymousUser.exists?
               end
               def available_custom_fields
                 []
               end
               # Overrides a few properties
               def logged?; false end
               def admin; false end
               def name(*args); I18n.t(:label_user_anonymous) end
               def mail; nil end
               def time_zone; nil end
               def rss_key; nil end
               def pref
                 UserPreference.new(:user => self)
               end
               # Returns the user's bult-in role
               def builtin_role
                 @builtin_role ||= Role.anonymous
               end
               def membership(*args)
                 nil
               end
               def member_of?(*args)
                 false
               end
               # Anonymous user can not be destroyed
               def destroy
                 false
               end
             end

app/views/queries/_form.html.erb +20 -3

             <%= error_messages_for 'query' %>
             <div class="box">
             <div class="tabular">
             <p><label for="query_name"><%=l(:field_name)%></label>
             <%= text_field 'query', 'name', :size => 80 %></p>
             <% if User.current.admin? || User.current.allowed_to?(:manage_public_queries, @project) %>
-            <p><label for="query_is_public"><%=l(:field_is_public)%></label>
+            <p><label><%=l(:field_visible)%></label>
-            <%= check_box 'query', 'is_public',
+              <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PRIVATE %> <%= l(:label_visibility_private) %></label>
-                  :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("#query_is_for_all").removeAttr("checked"); $("#query_is_for_all").attr("disabled", true);} else {$("#query_is_for_all").removeAttr("disabled");}') %></p>
+              <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_ROLES %> <%= l(:label_visibility_roles) %>:</label>
+              <% Role.givable.sorted.each do |role| %>
+                <label class="block role-visibility"><%= check_box_tag 'query[role_ids][]', role.id, @query.roles.include?(role), :id => nil %> <%= role.name %></label>
+              <% end %>
+              <label class="block"><%= radio_button 'query', 'visibility', Query::VISIBILITY_PUBLIC %> <%= l(:label_visibility_public) %></label>
+              <%= hidden_field_tag 'query[role_ids][]', '' %>
+            </p>
             <% end %>
             <p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
             <%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
                   :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
+            <fieldset><legend><%= l(:label_options) %></legend>
             <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',
                   :onclick => 'if (this.checked) {$("#columns").hide();} else {$("#columns").show();}' %></p>
             <p><label for="query_group_by"><%= l(:field_group_by) %></label>
             <%= select 'query', 'group_by', @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, :include_blank => true %></p>
             <p><label><%= l(:button_show) %></label>
             <%= available_block_columns_tags(@query) %></p>
+            </fieldset>
             </div>
             <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
             <%= render :partial => 'queries/filters', :locals => {:query => query}%>
             </fieldset>
             <fieldset><legend><%= l(:label_sort) %></legend>
             <% 3.times do |i| %>
             <%= i+1 %>:
             <%= label_tag "query_sort_criteria_attribute_" + i.to_s,
                           l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %>
             <%= select_tag("query[sort_criteria][#{i}][]",
                            options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)),
                            :id => "query_sort_criteria_attribute_" + i.to_s)%>
             <%= label_tag "query_sort_criteria_direction_" + i.to_s,
                           l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %>
             <%= select_tag("query[sort_criteria][#{i}][]",
                             options_for_select([[], [l(:label_ascending), 'asc'], [l(:label_descending), 'desc']], @query.sort_criteria_order(i)),
                             :id => "query_sort_criteria_direction_" + i.to_s) %>
             <br />
             <% end %>
             </fieldset>
             <%= content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
             <legend><%= l(:field_column_names) %></legend>
             <%= render_query_columns_selection(query) %>
             <% end %>
             </div>
+            <%= javascript_tag do %>
+            $(document).ready(function(){
+              $("input[name='query[visibility]']").change(function(){
+                var checked = $('#query_visibility_1').is(':checked');
+                $("input[name='query[role_ids][]'][type=checkbox]").attr('disabled', !checked);
+              }).trigger('change');
+            });
+            <% end %>

app/views/queries/index.api.rsb +1 -1

             api.array :queries, api_meta(:total_count => @query_count, :offset => @offset, :limit => @limit) do
               @queries.each do |query|
                 api.query do
                   api.id          query.id
                   api.name        query.name
-                  api.is_public   query.is_public
+                  api.is_public   query.is_public?
                   api.project_id  query.project_id
                 end
               end
             end

config/locales/en.yml +3 0

             en:
               # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
               direction: ltr
               date:
                 formats:
                   # Use the strftime parameters for formats.
                   # When no format has been given, it uses default.
                   # You can provide other formats here if you like!
                   default: "%m/%d/%Y"
                   short: "%b %d"
                   long: "%B %d, %Y"
                 day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
                 abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
                 # Don't forget the nil at the beginning; there's no such thing as a 0th month
                 month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
                 abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
                 # Used in date_select and datime_select.
                 order:
                   - :year
                   - :month
                   - :day
               time:
                 formats:
                   default: "%m/%d/%Y %I:%M %p"
                   time: "%I:%M %p"
                   short: "%d %b %H:%M"
                   long: "%B %d, %Y %H:%M"
                 am: "am"
                 pm: "pm"
               datetime:
                 distance_in_words:
                   half_a_minute: "half a minute"
                   less_than_x_seconds:
                     one:   "less than 1 second"
                     other: "less than %{count} seconds"
                   x_seconds:
                     one:   "1 second"
                     other: "%{count} seconds"
                   less_than_x_minutes:
                     one:   "less than a minute"
                     other: "less than %{count} minutes"
                   x_minutes:
                     one:   "1 minute"
                     other: "%{count} minutes"
                   about_x_hours:
                     one:   "about 1 hour"
                     other: "about %{count} hours"
                   x_hours:
                     one:   "1 hour"
                     other: "%{count} hours"
                   x_days:
                     one:   "1 day"
                     other: "%{count} days"
                   about_x_months:
                     one:   "about 1 month"
                     other: "about %{count} months"
                   x_months:
                     one:   "1 month"
                     other: "%{count} months"
                   about_x_years:
                     one:   "about 1 year"
                     other: "about %{count} years"
                   over_x_years:
                     one:   "over 1 year"
                     other: "over %{count} years"
                   almost_x_years:
                     one:   "almost 1 year"
                     other: "almost %{count} years"
               number:
                 format:
                   separator: "."
                   delimiter: ""
                   precision: 3
                 human:
                   format:
                     delimiter: ""
                     precision: 3
                   storage_units:
                     format: "%n %u"
                     units:
                       byte:
                         one: "Byte"
                         other: "Bytes"
                       kb: "KB"
                       mb: "MB"
                       gb: "GB"
                       tb: "TB"
             # Used in array.to_sentence.
               support:
                 array:
                   sentence_connector: "and"
                   skip_last_comma: false
               activerecord:
                 errors:
                   template:
                     header:
                       one:    "1 error prohibited this %{model} from being saved"
                       other:  "%{count} errors prohibited this %{model} from being saved"
                   messages:
                     inclusion: "is not included in the list"
                     exclusion: "is reserved"
                     invalid: "is invalid"
                     confirmation: "doesn't match confirmation"
                     accepted: "must be accepted"
                     empty: "can't be empty"
                     blank: "can't be blank"
                     too_long: "is too long (maximum is %{count} characters)"
                     too_short: "is too short (minimum is %{count} characters)"
                     wrong_length: "is the wrong length (should be %{count} characters)"
                     taken: "has already been taken"
                     not_a_number: "is not a number"
                     not_a_date: "is not a valid date"
                     greater_than: "must be greater than %{count}"
                     greater_than_or_equal_to: "must be greater than or equal to %{count}"
                     equal_to: "must be equal to %{count}"
                     less_than: "must be less than %{count}"
                     less_than_or_equal_to: "must be less than or equal to %{count}"
                     odd: "must be odd"
                     even: "must be even"
                     greater_than_start_date: "must be greater than start date"
                     not_same_project: "doesn't belong to the same project"
                     circular_dependency: "This relation would create a circular dependency"
                     cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks"
                     earlier_than_minimum_start_date: "cannot be earlier than %{date} because of preceding issues"
               actionview_instancetag_blank_option: Please select
               general_text_No: 'No'
               general_text_Yes: 'Yes'
               general_text_no: 'no'
               general_text_yes: 'yes'
               general_lang_name: 'English'
               general_csv_separator: ','
               general_csv_decimal_separator: '.'
               general_csv_encoding: ISO-8859-1
               general_pdf_encoding: UTF-8
               general_first_day_of_week: '7'
               notice_account_updated: Account was successfully updated.
               notice_account_invalid_creditentials: Invalid user or password
               notice_account_password_updated: Password was successfully updated.
               notice_account_wrong_password: Wrong password
               notice_account_register_done: Account was successfully created. An email containing the instructions to activate your account was sent to %{email}.
               notice_account_unknown_email: Unknown user.
               notice_account_not_activated_yet: You haven't activated your account yet. If you want to receive a new activation email, please <a href="%{url}">click this link</a>.
               notice_account_locked: Your account is locked.
               notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
               notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
               notice_account_activated: Your account has been activated. You can now log in.
               notice_successful_create: Successful creation.
               notice_successful_update: Successful update.
               notice_successful_delete: Successful deletion.
               notice_successful_connection: Successful connection.
               notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
               notice_locking_conflict: Data has been updated by another user.
               notice_not_authorized: You are not authorized to access this page.
               notice_not_authorized_archived_project: The project you're trying to access has been archived.
               notice_email_sent: "An email was sent to %{value}"
               notice_email_error: "An error occurred while sending mail (%{value})"
               notice_feeds_access_key_reseted: Your Atom access key was reset.
               notice_api_access_key_reseted: Your API access key was reset.
               notice_failed_to_save_issues: "Failed to save %{count} issue(s) on %{total} selected: %{ids}."
               notice_failed_to_save_time_entries: "Failed to save %{count} time entrie(s) on %{total} selected: %{ids}."
               notice_failed_to_save_members: "Failed to save member(s): %{errors}."
               notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
               notice_account_pending: "Your account was created and is now pending administrator approval."
               notice_default_data_loaded: Default configuration successfully loaded.
               notice_unable_delete_version: Unable to delete version.
               notice_unable_delete_time_entry: Unable to delete time log entry.
               notice_issue_done_ratios_updated: Issue done ratios updated.
               notice_gantt_chart_truncated: "The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})"
               notice_issue_successful_create: "Issue %{id} created."
               notice_issue_update_conflict: "The issue has been updated by an other user while you were editing it."
               notice_account_deleted: "Your account has been permanently deleted."
               notice_user_successful_create: "User %{id} created."
               error_can_t_load_default_data: "Default configuration could not be loaded: %{value}"
               error_scm_not_found: "The entry or revision was not found in the repository."
               error_scm_command_failed: "An error occurred when trying to access the repository: %{value}"
               error_scm_annotate: "The entry does not exist or cannot be annotated."
               error_scm_annotate_big_text_file: "The entry cannot be annotated, as it exceeds the maximum text file size."
               error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
               error_no_tracker_in_project: 'No tracker is associated to this project. Please check the Project settings.'
               error_no_default_issue_status: 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
               error_can_not_delete_custom_field: Unable to delete custom field
               error_can_not_delete_tracker: "This tracker contains issues and cannot be deleted."
               error_can_not_remove_role: "This role is in use and cannot be deleted."
               error_can_not_reopen_issue_on_closed_version: 'An issue assigned to a closed version cannot be reopened'
               error_can_not_archive_project: This project cannot be archived
               error_issue_done_ratios_not_updated: "Issue done ratios not updated."
               error_workflow_copy_source: 'Please select a source tracker or role'
               error_workflow_copy_target: 'Please select target tracker(s) and role(s)'
               error_unable_delete_issue_status: 'Unable to delete issue status'
               error_unable_to_connect: "Unable to connect (%{value})"
               error_attachment_too_big: "This file cannot be uploaded because it exceeds the maximum allowed file size (%{max_size})"
               error_session_expired: "Your session has expired. Please login again."
               warning_attachments_not_saved: "%{count} file(s) could not be saved."
               mail_subject_lost_password: "Your %{value} password"
               mail_body_lost_password: 'To change your password, click on the following link:'
               mail_subject_register: "Your %{value} account activation"
               mail_body_register: 'To activate your account, click on the following link:'
               mail_body_account_information_external: "You can use your %{value} account to log in."
               mail_body_account_information: Your account information
               mail_subject_account_activation_request: "%{value} account activation request"
               mail_body_account_activation_request: "A new user (%{value}) has registered. The account is pending your approval:"
               mail_subject_reminder: "%{count} issue(s) due in the next %{days} days"
               mail_body_reminder: "%{count} issue(s) that are assigned to you are due in the next %{days} days:"
               mail_subject_wiki_content_added: "'%{id}' wiki page has been added"
               mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}."
               mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
               mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
               field_name: Name
               field_description: Description
               field_summary: Summary
               field_is_required: Required
               field_firstname: First name
               field_lastname: Last name
               field_mail: Email
               field_filename: File
               field_filesize: Size
               field_downloads: Downloads
               field_author: Author
               field_created_on: Created
               field_updated_on: Updated
               field_closed_on: Closed
               field_field_format: Format
               field_is_for_all: For all projects
               field_possible_values: Possible values
               field_regexp: Regular expression
               field_min_length: Minimum length
               field_max_length: Maximum length
               field_value: Value
               field_category: Category
               field_title: Title
               field_project: Project
               field_issue: Issue
               field_status: Status
               field_notes: Notes
               field_is_closed: Issue closed
               field_is_default: Default value
               field_tracker: Tracker
               field_subject: Subject
               field_due_date: Due date
               field_assigned_to: Assignee
               field_priority: Priority
               field_fixed_version: Target version
               field_user: User
               field_principal: Principal
               field_role: Role
               field_homepage: Homepage
               field_is_public: Public
               field_parent: Subproject of
               field_is_in_roadmap: Issues displayed in roadmap
               field_login: Login
               field_mail_notification: Email notifications
               field_admin: Administrator
               field_last_login_on: Last connection
               field_language: Language
               field_effective_date: Date
               field_password: Password
               field_new_password: New password
               field_password_confirmation: Confirmation
               field_version: Version
               field_type: Type
               field_host: Host
               field_port: Port
               field_account: Account
               field_base_dn: Base DN
               field_attr_login: Login attribute
               field_attr_firstname: Firstname attribute
               field_attr_lastname: Lastname attribute
               field_attr_mail: Email attribute
               field_onthefly: On-the-fly user creation
               field_start_date: Start date
               field_done_ratio: "% Done"
               field_auth_source: Authentication mode
               field_hide_mail: Hide my email address
               field_comments: Comment
               field_url: URL
               field_start_page: Start page
               field_subproject: Subproject
               field_hours: Hours
               field_activity: Activity
               field_spent_on: Date
               field_identifier: Identifier
               field_is_filter: Used as a filter
               field_issue_to: Related issue
               field_delay: Delay
               field_assignable: Issues can be assigned to this role
               field_redirect_existing_links: Redirect existing links
               field_estimated_hours: Estimated time
               field_column_names: Columns
               field_time_entries: Log time
               field_time_zone: Time zone
               field_searchable: Searchable
               field_default_value: Default value
               field_comments_sorting: Display comments
               field_parent_title: Parent page
               field_editable: Editable
               field_watcher: Watcher
               field_identity_url: OpenID URL
               field_content: Content
               field_group_by: Group results by
               field_sharing: Sharing
               field_parent_issue: Parent task
               field_member_of_group: "Assignee's group"
               field_assigned_to_role: "Assignee's role"
               field_text: Text field
               field_visible: Visible
               field_warn_on_leaving_unsaved: "Warn me when leaving a page with unsaved text"
               field_issues_visibility: Issues visibility
               field_is_private: Private
               field_commit_logs_encoding: Commit messages encoding
               field_scm_path_encoding: Path encoding
               field_path_to_repository: Path to repository
               field_root_directory: Root directory
               field_cvsroot: CVSROOT
               field_cvs_module: Module
               field_repository_is_default: Main repository
               field_multiple: Multiple values
               field_auth_source_ldap_filter: LDAP filter
               field_core_fields: Standard fields
               field_timeout: "Timeout (in seconds)"
               field_board_parent: Parent forum
               field_private_notes: Private notes
               field_inherit_members: Inherit members
               field_generate_password: Generate password
               setting_app_title: Application title
               setting_app_subtitle: Application subtitle
               setting_welcome_text: Welcome text
               setting_default_language: Default language
               setting_login_required: Authentication required
               setting_self_registration: Self-registration
               setting_attachment_max_size: Maximum attachment size
               setting_issues_export_limit: Issues export limit
               setting_mail_from: Emission email address
               setting_bcc_recipients: Blind carbon copy recipients (bcc)
               setting_plain_text_mail: Plain text mail (no HTML)
               setting_host_name: Host name and path
               setting_text_formatting: Text formatting
               setting_wiki_compression: Wiki history compression
               setting_feeds_limit: Maximum number of items in Atom feeds
               setting_default_projects_public: New projects are public by default
               setting_autofetch_changesets: Fetch commits automatically
               setting_sys_api_enabled: Enable WS for repository management
               setting_commit_ref_keywords: Referencing keywords
               setting_commit_fix_keywords: Fixing keywords
               setting_autologin: Autologin
               setting_date_format: Date format
               setting_time_format: Time format
               setting_cross_project_issue_relations: Allow cross-project issue relations
               setting_cross_project_subtasks: Allow cross-project subtasks
               setting_issue_list_default_columns: Default columns displayed on the issue list
               setting_repositories_encodings: Attachments and repositories encodings
               setting_emails_header: Email header
               setting_emails_footer: Email footer
               setting_protocol: Protocol
               setting_per_page_options: Objects per page options
               setting_user_format: Users display format
               setting_activity_days_default: Days displayed on project activity
               setting_display_subprojects_issues: Display subprojects issues on main projects by default
               setting_enabled_scm: Enabled SCM
               setting_mail_handler_body_delimiters: "Truncate emails after one of these lines"
               setting_mail_handler_api_enabled: Enable WS for incoming emails
               setting_mail_handler_api_key: API key
               setting_sequential_project_identifiers: Generate sequential project identifiers
               setting_gravatar_enabled: Use Gravatar user icons
               setting_gravatar_default: Default Gravatar image
               setting_diff_max_lines_displayed: Maximum number of diff lines displayed
               setting_file_max_size_displayed: Maximum size of text files displayed inline
               setting_repository_log_display_limit: Maximum number of revisions displayed on file log
               setting_openid: Allow OpenID login and registration
               setting_password_min_length: Minimum password length
               setting_new_project_user_role_id: Role given to a non-admin user who creates a project
               setting_default_projects_modules: Default enabled modules for new projects
               setting_issue_done_ratio: Calculate the issue done ratio with
               setting_issue_done_ratio_issue_field: Use the issue field
               setting_issue_done_ratio_issue_status: Use the issue status
               setting_start_of_week: Start calendars on
               setting_rest_api_enabled: Enable REST web service
               setting_cache_formatted_text: Cache formatted text
               setting_default_notification_option: Default notification option
               setting_commit_logtime_enabled: Enable time logging
               setting_commit_logtime_activity_id: Activity for logged time
               setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
               setting_issue_group_assignment: Allow issue assignment to groups
               setting_default_issue_start_date_to_creation_date: Use current date as start date for new issues
               setting_commit_cross_project_ref: Allow issues of all the other projects to be referenced and fixed
               setting_unsubscribe: Allow users to delete their own account
               setting_session_lifetime: Session maximum lifetime
               setting_session_timeout: Session inactivity timeout
               setting_thumbnails_enabled: Display attachment thumbnails
               setting_thumbnails_size: Thumbnails size (in pixels)
               setting_non_working_week_days: Non-working days
               setting_jsonp_enabled: Enable JSONP support
               setting_default_projects_tracker_ids: Default trackers for new projects
               permission_add_project: Create project
               permission_add_subprojects: Create subprojects
               permission_edit_project: Edit project
               permission_close_project: Close / reopen the project
               permission_select_project_modules: Select project modules
               permission_manage_members: Manage members
               permission_manage_project_activities: Manage project activities
               permission_manage_versions: Manage versions
               permission_manage_categories: Manage issue categories
               permission_view_issues: View Issues
               permission_add_issues: Add issues
               permission_edit_issues: Edit issues
               permission_manage_issue_relations: Manage issue relations
               permission_set_issues_private: Set issues public or private
               permission_set_own_issues_private: Set own issues public or private
               permission_add_issue_notes: Add notes
               permission_edit_issue_notes: Edit notes
               permission_edit_own_issue_notes: Edit own notes
               permission_view_private_notes: View private notes
               permission_set_notes_private: Set notes as private
               permission_move_issues: Move issues
               permission_delete_issues: Delete issues
               permission_manage_public_queries: Manage public queries
               permission_save_queries: Save queries
               permission_view_gantt: View gantt chart
               permission_view_calendar: View calendar
               permission_view_issue_watchers: View watchers list
               permission_add_issue_watchers: Add watchers
               permission_delete_issue_watchers: Delete watchers
               permission_log_time: Log spent time
               permission_view_time_entries: View spent time
               permission_edit_time_entries: Edit time logs
               permission_edit_own_time_entries: Edit own time logs
               permission_manage_news: Manage news
               permission_comment_news: Comment news
               permission_view_documents: View documents
               permission_add_documents: Add documents
               permission_edit_documents: Edit documents
               permission_delete_documents: Delete documents
               permission_manage_files: Manage files
               permission_view_files: View files
               permission_manage_wiki: Manage wiki
               permission_rename_wiki_pages: Rename wiki pages
               permission_delete_wiki_pages: Delete wiki pages
               permission_view_wiki_pages: View wiki
               permission_view_wiki_edits: View wiki history
               permission_edit_wiki_pages: Edit wiki pages
               permission_delete_wiki_pages_attachments: Delete attachments
               permission_protect_wiki_pages: Protect wiki pages
               permission_manage_repository: Manage repository
               permission_browse_repository: Browse repository
               permission_view_changesets: View changesets
               permission_commit_access: Commit access
               permission_manage_boards: Manage forums
               permission_view_messages: View messages
               permission_add_messages: Post messages
               permission_edit_messages: Edit messages
               permission_edit_own_messages: Edit own messages
               permission_delete_messages: Delete messages
               permission_delete_own_messages: Delete own messages
               permission_export_wiki_pages: Export wiki pages
               permission_manage_subtasks: Manage subtasks
               permission_manage_related_issues: Manage related issues
               project_module_issue_tracking: Issue tracking
               project_module_time_tracking: Time tracking
               project_module_news: News
               project_module_documents: Documents
               project_module_files: Files
               project_module_wiki: Wiki
               project_module_repository: Repository
               project_module_boards: Forums
               project_module_calendar: Calendar
               project_module_gantt: Gantt
               label_user: User
               label_user_plural: Users
               label_user_new: New user
               label_user_anonymous: Anonymous
               label_project: Project
               label_project_new: New project
               label_project_plural: Projects
               label_x_projects:
                 zero:  no projects
                 one:   1 project
                 other: "%{count} projects"
               label_project_all: All Projects
               label_project_latest: Latest projects
               label_issue: Issue
               label_issue_new: New issue
               label_issue_plural: Issues
               label_issue_view_all: View all issues
               label_issues_by: "Issues by %{value}"
               label_issue_added: Issue added
               label_issue_updated: Issue updated
               label_issue_note_added: Note added
               label_issue_status_updated: Status updated
               label_issue_priority_updated: Priority updated
               label_document: Document
               label_document_new: New document
               label_document_plural: Documents
               label_document_added: Document added
               label_role: Role
               label_role_plural: Roles
               label_role_new: New role
               label_role_and_permissions: Roles and permissions
               label_role_anonymous: Anonymous
               label_role_non_member: Non member
               label_member: Member
               label_member_new: New member
               label_member_plural: Members
               label_tracker: Tracker
               label_tracker_plural: Trackers
               label_tracker_new: New tracker
               label_workflow: Workflow
               label_issue_status: Issue status
               label_issue_status_plural: Issue statuses
               label_issue_status_new: New status
               label_issue_category: Issue category
               label_issue_category_plural: Issue categories
               label_issue_category_new: New category
               label_custom_field: Custom field
               label_custom_field_plural: Custom fields
               label_custom_field_new: New custom field
               label_enumerations: Enumerations
               label_enumeration_new: New value
               label_information: Information
               label_information_plural: Information
               label_please_login: Please log in
               label_register: Register
               label_login_with_open_id_option: or login with OpenID
               label_password_lost: Lost password
               label_home: Home
               label_my_page: My page
               label_my_account: My account
               label_my_projects: My projects
               label_my_page_block: My page block
               label_administration: Administration
               label_login: Sign in
               label_logout: Sign out
               label_help: Help
               label_reported_issues: Reported issues
               label_assigned_to_me_issues: Issues assigned to me
               label_last_login: Last connection
               label_registered_on: Registered on
               label_activity: Activity
               label_overall_activity: Overall activity
               label_user_activity: "%{value}'s activity"
               label_new: New
               label_logged_as: Logged in as
               label_environment: Environment
               label_authentication: Authentication
               label_auth_source: Authentication mode
               label_auth_source_new: New authentication mode
               label_auth_source_plural: Authentication modes
               label_subproject_plural: Subprojects
               label_subproject_new: New subproject
               label_and_its_subprojects: "%{value} and its subprojects"
               label_min_max_length: Min - Max length
               label_list: List
               label_date: Date
               label_integer: Integer
               label_float: Float
               label_boolean: Boolean
               label_string: Text
               label_text: Long text
               label_attribute: Attribute
               label_attribute_plural: Attributes
               label_no_data: No data to display
               label_change_status: Change status
               label_history: History
               label_attachment: File
               label_attachment_new: New file
               label_attachment_delete: Delete file
               label_attachment_plural: Files
               label_file_added: File added
               label_report: Report
               label_report_plural: Reports
               label_news: News
               label_news_new: Add news
               label_news_plural: News
               label_news_latest: Latest news
               label_news_view_all: View all news
               label_news_added: News added
               label_news_comment_added: Comment added to a news
               label_settings: Settings
               label_overview: Overview
               label_version: Version
               label_version_new: New version
               label_version_plural: Versions
               label_close_versions: Close completed versions
               label_confirmation: Confirmation
               label_export_to: 'Also available in:'
               label_read: Read...
               label_public_projects: Public projects
               label_open_issues: open
               label_open_issues_plural: open
               label_closed_issues: closed
               label_closed_issues_plural: closed
               label_x_open_issues_abbr_on_total:
                 zero:  0 open / %{total}
                 one:   1 open / %{total}
                 other: "%{count} open / %{total}"
               label_x_open_issues_abbr:
                 zero:  0 open
                 one:   1 open
                 other: "%{count} open"
               label_x_closed_issues_abbr:
                 zero:  0 closed
                 one:   1 closed
                 other: "%{count} closed"
               label_x_issues:
                 zero:  0 issues
                 one:   1 issue
                 other: "%{count} issues"
               label_total: Total
               label_total_time: Total time
               label_permissions: Permissions
               label_current_status: Current status
               label_new_statuses_allowed: New statuses allowed
               label_all: all
               label_any: any
               label_none: none
               label_nobody: nobody
               label_next: Next
               label_previous: Previous
               label_used_by: Used by
               label_details: Details
               label_add_note: Add a note
               label_per_page: Per page
               label_calendar: Calendar
               label_months_from: months from
               label_gantt: Gantt
               label_internal: Internal
               label_last_changes: "last %{count} changes"
               label_change_view_all: View all changes
               label_personalize_page: Personalize this page
               label_comment: Comment
               label_comment_plural: Comments
               label_x_comments:
                 zero: no comments
                 one: 1 comment
                 other: "%{count} comments"
               label_comment_add: Add a comment
               label_comment_added: Comment added
               label_comment_delete: Delete comments
               label_query: Custom query
               label_query_plural: Custom queries
               label_query_new: New query
               label_my_queries: My custom queries
               label_filter_add: Add filter
               label_filter_plural: Filters
               label_equals: is
               label_not_equals: is not
               label_in_less_than: in less than
               label_in_more_than: in more than
               label_in_the_next_days: in the next
               label_in_the_past_days: in the past
               label_greater_or_equal: '>='
               label_less_or_equal: '<='
               label_between: between
               label_in: in
               label_today: today
               label_all_time: all time
               label_yesterday: yesterday
               label_this_week: this week
               label_last_week: last week
               label_last_n_weeks: "last %{count} weeks"
               label_last_n_days: "last %{count} days"
               label_this_month: this month
               label_last_month: last month
               label_this_year: this year
               label_date_range: Date range
               label_less_than_ago: less than days ago
               label_more_than_ago: more than days ago
               label_ago: days ago
               label_contains: contains
               label_not_contains: doesn't contain
               label_any_issues_in_project: any issues in project
               label_any_issues_not_in_project: any issues not in project
               label_no_issues_in_project: no issues in project
               label_day_plural: days
               label_repository: Repository
               label_repository_new: New repository
               label_repository_plural: Repositories
               label_browse: Browse
               label_branch: Branch
               label_tag: Tag
               label_revision: Revision
               label_revision_plural: Revisions
               label_revision_id: "Revision %{value}"
               label_associated_revisions: Associated revisions
               label_added: added
               label_modified: modified
               label_copied: copied
               label_renamed: renamed
               label_deleted: deleted
               label_latest_revision: Latest revision
               label_latest_revision_plural: Latest revisions
               label_view_revisions: View revisions
               label_view_all_revisions: View all revisions
               label_max_size: Maximum size
               label_sort_highest: Move to top
               label_sort_higher: Move up
               label_sort_lower: Move down
               label_sort_lowest: Move to bottom
               label_roadmap: Roadmap
               label_roadmap_due_in: "Due in %{value}"
               label_roadmap_overdue: "%{value} late"
               label_roadmap_no_issues: No issues for this version
               label_search: Search
               label_result_plural: Results
               label_all_words: All words
               label_wiki: Wiki
               label_wiki_edit: Wiki edit
               label_wiki_edit_plural: Wiki edits
               label_wiki_page: Wiki page
               label_wiki_page_plural: Wiki pages
               label_index_by_title: Index by title
               label_index_by_date: Index by date
               label_current_version: Current version
               label_preview: Preview
               label_feed_plural: Feeds
               label_changes_details: Details of all changes
               label_issue_tracking: Issue tracking
               label_spent_time: Spent time
               label_overall_spent_time: Overall spent time
               label_f_hour: "%{value} hour"
               label_f_hour_plural: "%{value} hours"
               label_time_tracking: Time tracking
               label_change_plural: Changes
               label_statistics: Statistics
               label_commits_per_month: Commits per month
               label_commits_per_author: Commits per author
               label_diff: diff
               label_view_diff: View differences
               label_diff_inline: inline
               label_diff_side_by_side: side by side
               label_options: Options
               label_copy_workflow_from: Copy workflow from
               label_permissions_report: Permissions report
               label_watched_issues: Watched issues
               label_related_issues: Related issues
               label_applied_status: Applied status
               label_loading: Loading...
               label_relation_new: New relation
               label_relation_delete: Delete relation
               label_relates_to: Related to
               label_duplicates: Duplicates
               label_duplicated_by: Duplicated by
               label_blocks: Blocks
               label_blocked_by: Blocked by
               label_precedes: Precedes
               label_follows: Follows
               label_copied_to: Copied to
               label_copied_from: Copied from
               label_end_to_start: end to start
               label_end_to_end: end to end
               label_start_to_start: start to start
               label_start_to_end: start to end
               label_stay_logged_in: Stay logged in
               label_disabled: disabled
               label_show_completed_versions: Show completed versions
               label_me: me
               label_board: Forum
               label_board_new: New forum
               label_board_plural: Forums
               label_board_locked: Locked
               label_board_sticky: Sticky
               label_topic_plural: Topics
               label_message_plural: Messages
               label_message_last: Last message
               label_message_new: New message
               label_message_posted: Message added
               label_reply_plural: Replies
               label_send_information: Send account information to the user
               label_year: Year
               label_month: Month
               label_week: Week
               label_date_from: From
               label_date_to: To
               label_language_based: Based on user's language
               label_sort_by: "Sort by %{value}"
               label_send_test_email: Send a test email
               label_feeds_access_key: Atom access key
               label_missing_feeds_access_key: Missing a Atom access key
               label_feeds_access_key_created_on: "Atom access key created %{value} ago"
               label_module_plural: Modules
               label_added_time_by: "Added by %{author} %{age} ago"
               label_updated_time_by: "Updated by %{author} %{age} ago"
               label_updated_time: "Updated %{value} ago"
               label_jump_to_a_project: Jump to a project...
               label_file_plural: Files
               label_changeset_plural: Changesets
               label_default_columns: Default columns
               label_no_change_option: (No change)
               label_bulk_edit_selected_issues: Bulk edit selected issues
               label_bulk_edit_selected_time_entries: Bulk edit selected time entries
               label_theme: Theme
               label_default: Default
               label_search_titles_only: Search titles only
               label_user_mail_option_all: "For any event on all my projects"
               label_user_mail_option_selected: "For any event on the selected projects only..."
               label_user_mail_option_none: "No events"
               label_user_mail_option_only_my_events: "Only for things I watch or I'm involved in"
               label_user_mail_option_only_assigned: "Only for things I am assigned to"
               label_user_mail_option_only_owner: "Only for things I am the owner of"
               label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
               label_registration_activation_by_email: account activation by email
               label_registration_manual_activation: manual account activation
               label_registration_automatic_activation: automatic account activation
               label_display_per_page: "Per page: %{value}"
               label_age: Age
               label_change_properties: Change properties
               label_general: General
               label_more: More
               label_scm: SCM
               label_plugins: Plugins
               label_ldap_authentication: LDAP authentication
               label_downloads_abbr: D/L
               label_optional_description: Optional description
               label_add_another_file: Add another file
               label_preferences: Preferences
               label_chronological_order: In chronological order
               label_reverse_chronological_order: In reverse chronological order
               label_planning: Planning
               label_incoming_emails: Incoming emails
               label_generate_key: Generate a key
               label_issue_watchers: Watchers
               label_example: Example
               label_display: Display
               label_sort: Sort
               label_ascending: Ascending
               label_descending: Descending
               label_date_from_to: From %{start} to %{end}
               label_wiki_content_added: Wiki page added
               label_wiki_content_updated: Wiki page updated
               label_group: Group
               label_group_plural: Groups
               label_group_new: New group
               label_time_entry_plural: Spent time
               label_version_sharing_none: Not shared
               label_version_sharing_descendants: With subprojects
               label_version_sharing_hierarchy: With project hierarchy
               label_version_sharing_tree: With project tree
               label_version_sharing_system: With all projects
               label_update_issue_done_ratios: Update issue done ratios
               label_copy_source: Source
               label_copy_target: Target
               label_copy_same_as_target: Same as target
               label_display_used_statuses_only: Only display statuses that are used by this tracker
               label_api_access_key: API access key
               label_missing_api_access_key: Missing an API access key
               label_api_access_key_created_on: "API access key created %{value} ago"
               label_profile: Profile
               label_subtask_plural: Subtasks
               label_project_copy_notifications: Send email notifications during the project copy
               label_principal_search: "Search for user or group:"
               label_user_search: "Search for user:"
               label_additional_workflow_transitions_for_author: Additional transitions allowed when the user is the author
               label_additional_workflow_transitions_for_assignee: Additional transitions allowed when the user is the assignee
               label_issues_visibility_all: All issues
               label_issues_visibility_public: All non private issues
               label_issues_visibility_own: Issues created by or assigned to the user
               label_git_report_last_commit: Report last commit for files and directories
               label_parent_revision: Parent
               label_child_revision: Child
               label_export_options: "%{export_format} export options"
               label_copy_attachments: Copy attachments
               label_copy_subtasks: Copy subtasks
               label_item_position: "%{position} of %{count}"
               label_completed_versions: Completed versions
               label_search_for_watchers: Search for watchers to add
               label_session_expiration: Session expiration
               label_show_closed_projects: View closed projects
               label_status_transitions: Status transitions
               label_fields_permissions: Fields permissions
               label_readonly: Read-only
               label_required: Required
               label_attribute_of_project: "Project's %{name}"
               label_attribute_of_issue: "Issue's %{name}"
               label_attribute_of_author: "Author's %{name}"
               label_attribute_of_assigned_to: "Assignee's %{name}"
               label_attribute_of_user: "User's %{name}"
               label_attribute_of_fixed_version: "Target version's %{name}"
               label_cross_project_descendants: With subprojects
               label_cross_project_tree: With project tree
               label_cross_project_hierarchy: With project hierarchy
               label_cross_project_system: With all projects
               label_gantt_progress_line: Progress line
+              label_visibility_private: to me only
+              label_visibility_roles: to these roles only
+              label_visibility_public: to any users
               button_login: Login
               button_submit: Submit
               button_save: Save
               button_check_all: Check all
               button_uncheck_all: Uncheck all
               button_collapse_all: Collapse all
               button_expand_all: Expand all
               button_delete: Delete
               button_create: Create
               button_create_and_continue: Create and continue
               button_test: Test
               button_edit: Edit
               button_edit_associated_wikipage: "Edit associated Wiki page: %{page_title}"
               button_add: Add
               button_change: Change
               button_apply: Apply
               button_clear: Clear
               button_lock: Lock
               button_unlock: Unlock
               button_download: Download
               button_list: List
               button_view: View
               button_move: Move
               button_move_and_follow: Move and follow
               button_back: Back
               button_cancel: Cancel
               button_activate: Activate
               button_sort: Sort
               button_log_time: Log time
               button_rollback: Rollback to this version
               button_watch: Watch
               button_unwatch: Unwatch
               button_reply: Reply
               button_archive: Archive
               button_unarchive: Unarchive
               button_reset: Reset
               button_rename: Rename
               button_change_password: Change password
               button_copy: Copy
               button_copy_and_follow: Copy and follow
               button_annotate: Annotate
               button_update: Update
               button_configure: Configure
               button_quote: Quote
               button_duplicate: Duplicate
               button_show: Show
               button_hide: Hide
               button_edit_section: Edit this section
               button_export: Export
               button_delete_my_account: Delete my account
               button_close: Close
               button_reopen: Reopen
               status_active: active
               status_registered: registered
               status_locked: locked
               project_status_active: active
               project_status_closed: closed
               project_status_archived: archived
               version_status_open: open
               version_status_locked: locked
               version_status_closed: closed
               field_active: Active
               text_select_mail_notifications: Select actions for which email notifications should be sent.
               text_regexp_info: eg. ^[A-Z0-9]+$
               text_min_max_length_info: 0 means no restriction
               text_project_destroy_confirmation: Are you sure you want to delete this project and related data?
               text_subprojects_destroy_warning: "Its subproject(s): %{value} will be also deleted."
               text_workflow_edit: Select a role and a tracker to edit the workflow
               text_are_you_sure: Are you sure?
               text_journal_changed: "%{label} changed from %{old} to %{new}"
               text_journal_changed_no_detail: "%{label} updated"
               text_journal_set_to: "%{label} set to %{value}"
               text_journal_deleted: "%{label} deleted (%{old})"
               text_journal_added: "%{label} %{value} added"
               text_tip_issue_begin_day: issue beginning this day
               text_tip_issue_end_day: issue ending this day
               text_tip_issue_begin_end_day: issue beginning and ending this day
               text_project_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter.<br />Once saved, the identifier cannot be changed.'
               text_caracters_maximum: "%{count} characters maximum."
               text_caracters_minimum: "Must be at least %{count} characters long."
               text_length_between: "Length between %{min} and %{max} characters."
               text_tracker_no_workflow: No workflow defined for this tracker
               text_unallowed_characters: Unallowed characters
               text_comma_separated: Multiple values allowed (comma separated).
               text_line_separated: Multiple values allowed (one line for each value).
               text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
               text_issue_added: "Issue %{id} has been reported by %{author}."
               text_issue_updated: "Issue %{id} has been updated by %{author}."
               text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content?
               text_issue_category_destroy_question: "Some issues (%{count}) are assigned to this category. What do you want to do?"
               text_issue_category_destroy_assignments: Remove category assignments
               text_issue_category_reassign_to: Reassign issues to this category
               text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
               text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
               text_load_default_configuration: Load the default configuration
               text_status_changed_by_changeset: "Applied in changeset %{value}."
               text_time_logged_by_changeset: "Applied in changeset %{value}."
               text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s)?'
               text_issues_destroy_descendants_confirmation: "This will also delete %{count} subtask(s)."
               text_time_entries_destroy_confirmation: 'Are you sure you want to delete the selected time entr(y/ies)?'
               text_select_project_modules: 'Select modules to enable for this project:'
               text_default_administrator_account_changed: Default administrator account changed
               text_file_repository_writable: Attachments directory writable
               text_plugin_assets_writable: Plugin assets directory writable
               text_rmagick_available: RMagick available (optional)
               text_destroy_time_entries_question: "%{hours} hours were reported on the issues you are about to delete. What do you want to do?"
               text_destroy_time_entries: Delete reported hours
               text_assign_time_entries_to_project: Assign reported hours to the project
               text_reassign_time_entries: 'Reassign reported hours to this issue:'
               text_user_wrote: "%{value} wrote:"
               text_enumeration_destroy_question: "%{count} objects are assigned to this value."
               text_enumeration_category_reassign_to: 'Reassign them to this value:'
               text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/configuration.yml and restart the application to enable them."
               text_repository_usernames_mapping: "Select or update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
               text_diff_truncated: '... This diff was truncated because it exceeds the maximum size that can be displayed.'
               text_custom_field_possible_values_info: 'One line for each value'
               text_wiki_page_destroy_question: "This page has %{descendants} child page(s) and descendant(s). What do you want to do?"
               text_wiki_page_nullify_children: "Keep child pages as root pages"
               text_wiki_page_destroy_children: "Delete child pages and all their descendants"
               text_wiki_page_reassign_children: "Reassign child pages to this parent page"
               text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
               text_zoom_in: Zoom in
               text_zoom_out: Zoom out
               text_warn_on_leaving_unsaved: "The current page contains unsaved text that will be lost if you leave this page."
               text_scm_path_encoding_note: "Default: UTF-8"
               text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
               text_mercurial_repository_note: Local repository (e.g. /hgrepo, c:\hgrepo)
               text_scm_command: Command
               text_scm_command_version: Version
               text_scm_config: You can configure your SCM commands in config/configuration.yml. Please restart the application after editing it.
               text_scm_command_not_available: SCM command is not available. Please check settings on the administration panel.
               text_issue_conflict_resolution_overwrite: "Apply my changes anyway (previous notes will be kept but some changes may be overwritten)"
               text_issue_conflict_resolution_add_notes: "Add my notes and discard my other changes"
               text_issue_conflict_resolution_cancel: "Discard all my changes and redisplay %{link}"
               text_account_destroy_confirmation: "Are you sure you want to proceed?\nYour account will be permanently deleted, with no way to reactivate it."
               text_session_expiration_settings: "Warning: changing these settings may expire the current sessions including yours."
               text_project_closed: This project is closed and read-only.
               text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
               default_role_manager: Manager
               default_role_developer: Developer
               default_role_reporter: Reporter
               default_tracker_bug: Bug
               default_tracker_feature: Feature
               default_tracker_support: Support
               default_issue_status_new: New
               default_issue_status_in_progress: In Progress
               default_issue_status_resolved: Resolved
               default_issue_status_feedback: Feedback
               default_issue_status_closed: Closed
               default_issue_status_rejected: Rejected
               default_doc_category_user: User documentation
               default_doc_category_tech: Technical documentation
               default_priority_low: Low
               default_priority_normal: Normal
               default_priority_high: High
               default_priority_urgent: Urgent
               default_priority_immediate: Immediate
               default_activity_design: Design
               default_activity_development: Development
               enumeration_issue_priorities: Issue priorities
               enumeration_doc_categories: Document categories
               enumeration_activities: Activities (time tracking)
               enumeration_system_activity: System Activity
               description_filter: Filter
               description_search: Searchfield
               description_choose_project: Projects
               description_project_scope: Search scope
               description_notes: Notes
               description_message_content: Message content
               description_query_sort_criteria_attribute: Sort attribute
               description_query_sort_criteria_direction: Sort direction
               description_user_mail_notification: Mail notification settings
               description_available_columns: Available Columns
               description_selected_columns: Selected Columns
               description_all_columns: All Columns
               description_issue_category_reassign: Choose issue category
               description_wiki_subpages_reassign: Choose new parent page
               description_date_range_list: Choose range from list
               description_date_range_interval: Choose range by selecting start and end date
               description_date_from: Enter start date
               description_date_to: Enter end date
               text_repository_identifier_info: 'Only lower case letters (a-z), numbers, dashes and underscores are allowed.<br />Once saved, the identifier cannot be changed.'

config/locales/fr.yml +3 0

             # French translations for Ruby on Rails
             # by Christian Lescuyer (christian@flyingcoders.com)
             # contributor: Sebastien Grosjean - ZenCocoon.com
             # contributor: Thibaut Cuvelier - Developpez.com
             fr:
               direction: ltr
               date:
                 formats:
                   default: "%d/%m/%Y"
                   short: "%e %b"
                   long: "%e %B %Y"
                   long_ordinal: "%e %B %Y"
                   only_day: "%e"
                 day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
                 abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
                 month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
                 abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
                 order:
                   - :day
                   - :month
                   - :year
               time:
                 formats:
                   default: "%d/%m/%Y %H:%M"
                   time: "%H:%M"
                   short: "%d %b %H:%M"
                   long: "%A %d %B %Y %H:%M:%S %Z"
                   long_ordinal: "%A %d %B %Y %H:%M:%S %Z"
                   only_second: "%S"
                 am: 'am'
                 pm: 'pm'
               datetime:
                 distance_in_words:
                   half_a_minute: "30 secondes"
                   less_than_x_seconds:
                     zero:  "moins d'une seconde"
                     one:   "moins d'une seconde"
                     other: "moins de %{count} secondes"
                   x_seconds:
                     one:   "1 seconde"
                     other: "%{count} secondes"
                   less_than_x_minutes:
                     zero:  "moins d'une minute"
                     one:   "moins d'une minute"
                     other: "moins de %{count} minutes"
                   x_minutes:
                     one:   "1 minute"
                     other: "%{count} minutes"
                   about_x_hours:
                     one:   "environ une heure"
                     other: "environ %{count} heures"
                   x_hours:
                     one:   "une heure"
                     other: "%{count} heures"
                   x_days:
                     one:   "un jour"
                     other: "%{count} jours"
                   about_x_months:
                     one:   "environ un mois"
                     other: "environ %{count} mois"
                   x_months:
                     one:   "un mois"
                     other: "%{count} mois"
                   about_x_years:
                     one:   "environ un an"
                     other: "environ %{count} ans"
                   over_x_years:
                     one:   "plus d'un an"
                     other: "plus de %{count} ans"
                   almost_x_years:
                     one:   "presqu'un an"
                     other: "presque %{count} ans"
                 prompts:
                   year:   "Année"
                   month:  "Mois"
                   day:    "Jour"
                   hour:   "Heure"
                   minute: "Minute"
                   second: "Seconde"
               number:
                 format:
                   precision: 3
                   separator: ','
                   delimiter: ' '
                 currency:
                   format:
                     unit: '€'
                     precision: 2
                     format: '%n %u'
                 human:
                   format:
                     precision: 3
                   storage_units:
                     format: "%n %u"
                     units:
                       byte:
                         one: "octet"
                         other: "octet"
                       kb: "ko"
                       mb: "Mo"
                       gb: "Go"
                       tb: "To"
               support:
                 array:
                   sentence_connector: 'et'
                   skip_last_comma: true
                   word_connector: ", "
                   two_words_connector: " et "
                   last_word_connector: " et "
               activerecord:
                 errors:
                   template:
                     header:
                       one: "Impossible d'enregistrer %{model} : une erreur"
                       other: "Impossible d'enregistrer %{model} : %{count} erreurs."
                     body: "Veuillez vérifier les champs suivants :"
                   messages:
                     inclusion: "n'est pas inclus(e) dans la liste"
                     exclusion: "n'est pas disponible"
                     invalid: "n'est pas valide"
                     confirmation: "ne concorde pas avec la confirmation"
                     accepted: "doit être accepté(e)"
                     empty: "doit être renseigné(e)"
                     blank: "doit être renseigné(e)"
                     too_long: "est trop long (pas plus de %{count} caractères)"
                     too_short: "est trop court (au moins %{count} caractères)"
                     wrong_length: "ne fait pas la bonne longueur (doit comporter %{count} caractères)"
                     taken: "est déjà utilisé"
                     not_a_number: "n'est pas un nombre"
                     not_a_date: "n'est pas une date valide"
                     greater_than: "doit être supérieur à %{count}"
                     greater_than_or_equal_to: "doit être supérieur ou égal à %{count}"
                     equal_to: "doit être égal à %{count}"
                     less_than: "doit être inférieur à %{count}"
                     less_than_or_equal_to: "doit être inférieur ou égal à %{count}"
                     odd: "doit être impair"
                     even: "doit être pair"
                     greater_than_start_date: "doit être postérieure à la date de début"
                     not_same_project: "n'appartient pas au même projet"
                     circular_dependency: "Cette relation créerait une dépendance circulaire"
                     cant_link_an_issue_with_a_descendant: "Une demande ne peut pas être liée à l'une de ses sous-tâches"
                     earlier_than_minimum_start_date: "ne peut pas être antérieure au %{date} à cause des demandes qui précédent"
               actionview_instancetag_blank_option: Choisir
               general_text_No: 'Non'
               general_text_Yes: 'Oui'
               general_text_no: 'non'
               general_text_yes: 'oui'
               general_lang_name: 'Français'
               general_csv_separator: ';'
               general_csv_decimal_separator: ','
               general_csv_encoding: ISO-8859-1
               general_pdf_encoding: UTF-8
               general_first_day_of_week: '1'
               notice_account_updated: Le compte a été mis à jour avec succès.
               notice_account_invalid_creditentials: Identifiant ou mot de passe invalide.
               notice_account_password_updated: Mot de passe mis à jour avec succès.
               notice_account_wrong_password: Mot de passe incorrect
               notice_account_register_done: Un message contenant les instructions pour activer votre compte vous a été envoyé à l'adresse %{email}.
               notice_account_unknown_email: Aucun compte ne correspond à cette adresse.
               notice_account_not_activated_yet: Vous n'avez pas encore activé votre compte. Si vous voulez recevoir un nouveau message d'activation, veuillez <a href="%{url}">cliquer sur ce lien</a>.
               notice_account_locked: Votre compte est verrouillé.
               notice_can_t_change_password: Ce compte utilise une authentification externe. Impossible de changer le mot de passe.
               notice_account_lost_email_sent: Un message contenant les instructions pour choisir un nouveau mot de passe vous a été envoyé.
               notice_account_activated: Votre compte a été activé. Vous pouvez à présent vous connecter.
               notice_successful_create: Création effectuée avec succès.
               notice_successful_update: Mise à jour effectuée avec succès.
               notice_successful_delete: Suppression effectuée avec succès.
               notice_successful_connection: Connexion réussie.
               notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée."
               notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
               notice_not_authorized: "Vous n'êtes pas autorisé à accéder à cette page."
               notice_not_authorized_archived_project: Le projet auquel vous tentez d'accéder a été archivé.
               notice_email_sent: "Un email a été envoyé à %{value}"
               notice_email_error: "Erreur lors de l'envoi de l'email (%{value})"
               notice_feeds_access_key_reseted: "Votre clé d'accès aux flux Atom a été réinitialisée."
               notice_failed_to_save_issues: "%{count} demande(s) sur les %{total} sélectionnées n'ont pas pu être mise(s) à jour : %{ids}."
               notice_failed_to_save_time_entries: "%{count} temps passé(s) sur les %{total} sélectionnés n'ont pas pu être mis à jour: %{ids}."
               notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
               notice_account_pending: "Votre compte a été créé et attend l'approbation de l'administrateur."
               notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
               notice_unable_delete_version: Impossible de supprimer cette version.
               notice_issue_done_ratios_updated: L'avancement des demandes a été mis à jour.
               notice_api_access_key_reseted: Votre clé d'accès API a été réinitialisée.
               notice_gantt_chart_truncated: "Le diagramme a été tronqué car il excède le nombre maximal d'éléments pouvant être affichés (%{max})"
               notice_issue_successful_create: "Demande %{id} créée."
               notice_issue_update_conflict: "La demande a été mise à jour par un autre utilisateur pendant que vous la modifiez."
               notice_account_deleted: "Votre compte a été définitivement supprimé."
               notice_user_successful_create: "Utilisateur %{id} créé."
               error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage : %{value}"
               error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
               error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt : %{value}"
               error_scm_annotate: "L'entrée n'existe pas ou ne peut pas être annotée."
               error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
               error_can_not_reopen_issue_on_closed_version: 'Une demande assignée à une version fermée ne peut pas être réouverte'
               error_can_not_archive_project: "Ce projet ne peut pas être archivé"
               error_workflow_copy_source: 'Veuillez sélectionner un tracker et/ou un rôle source'
               error_workflow_copy_target: 'Veuillez sélectionner les trackers et rôles cibles'
               error_issue_done_ratios_not_updated: L'avancement des demandes n'a pas pu être mis à jour.
               error_attachment_too_big: Ce fichier ne peut pas être attaché car il excède la taille maximale autorisée (%{max_size})
               error_session_expired: "Votre session a expiré. Veuillez vous reconnecter."
               warning_attachments_not_saved: "%{count} fichier(s) n'ont pas pu être sauvegardés."
               mail_subject_lost_password: "Votre mot de passe %{value}"
               mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant :'
               mail_subject_register: "Activation de votre compte %{value}"
               mail_body_register: 'Pour activer votre compte, cliquez sur le lien suivant :'
               mail_body_account_information_external: "Vous pouvez utiliser votre compte %{value} pour vous connecter."
               mail_body_account_information: Paramètres de connexion de votre compte
               mail_subject_account_activation_request: "Demande d'activation d'un compte %{value}"
               mail_body_account_activation_request: "Un nouvel utilisateur (%{value}) s'est inscrit. Son compte nécessite votre approbation :"
               mail_subject_reminder: "%{count} demande(s) arrivent à échéance (%{days})"
               mail_body_reminder: "%{count} demande(s) qui vous sont assignées arrivent à échéance dans les %{days} prochains jours :"
               mail_subject_wiki_content_added: "Page wiki '%{id}' ajoutée"
               mail_body_wiki_content_added: "La page wiki '%{id}' a été ajoutée par %{author}."
               mail_subject_wiki_content_updated: "Page wiki '%{id}' mise à jour"
               mail_body_wiki_content_updated: "La page wiki '%{id}' a été mise à jour par %{author}."
               field_name: Nom
               field_description: Description
               field_summary: Résumé
               field_is_required: Obligatoire
               field_firstname: Prénom
               field_lastname: Nom
               field_mail: "Email "
               field_filename: Fichier
               field_filesize: Taille
               field_downloads: Téléchargements
               field_author: Auteur
               field_created_on: "Créé "
               field_updated_on: "Mis-à-jour "
               field_closed_on: Fermé
               field_field_format: Format
               field_is_for_all: Pour tous les projets
               field_possible_values: Valeurs possibles
               field_regexp: Expression régulière
               field_min_length: Longueur minimum
               field_max_length: Longueur maximum
               field_value: Valeur
               field_category: Catégorie
               field_title: Titre
               field_project: Projet
               field_issue: Demande
               field_status: Statut
               field_notes: Notes
               field_is_closed: Demande fermée
               field_is_default: Valeur par défaut
               field_tracker: Tracker
               field_subject: Sujet
               field_due_date: Echéance
               field_assigned_to: Assigné à
               field_priority: Priorité
               field_fixed_version: Version cible
               field_user: Utilisateur
               field_role: Rôle
               field_homepage: "Site web "
               field_is_public: Public
               field_parent: Sous-projet de
               field_is_in_roadmap: Demandes affichées dans la roadmap
               field_login: "Identifiant "
               field_mail_notification: Notifications par mail
               field_admin: Administrateur
               field_last_login_on: "Dernière connexion "
               field_language: Langue
               field_effective_date: Date
               field_password: Mot de passe
               field_new_password: Nouveau mot de passe
               field_password_confirmation: Confirmation
               field_version: Version
               field_type: Type
               field_host: Hôte
               field_port: Port
               field_account: Compte
               field_base_dn: Base DN
               field_attr_login: Attribut Identifiant
               field_attr_firstname: Attribut Prénom
               field_attr_lastname: Attribut Nom
               field_attr_mail: Attribut Email
               field_onthefly: Création des utilisateurs à la volée
               field_start_date: Début
               field_done_ratio: "% réalisé"
               field_auth_source: Mode d'authentification
               field_hide_mail: Cacher mon adresse mail
               field_comments: Commentaire
               field_url: URL
               field_start_page: Page de démarrage
               field_subproject: Sous-projet
               field_hours: Heures
               field_activity: Activité
               field_spent_on: Date
               field_identifier: Identifiant
               field_is_filter: Utilisé comme filtre
               field_issue_to: Demande liée
               field_delay: Retard
               field_assignable: Demandes assignables à ce rôle
               field_redirect_existing_links: Rediriger les liens existants
               field_estimated_hours: Temps estimé
               field_column_names: Colonnes
               field_time_zone: Fuseau horaire
               field_searchable: Utilisé pour les recherches
               field_default_value: Valeur par défaut
               field_comments_sorting: Afficher les commentaires
               field_parent_title: Page parent
               field_editable: Modifiable
               field_watcher: Observateur
               field_identity_url: URL OpenID
               field_content: Contenu
               field_group_by: Grouper par
               field_sharing: Partage
               field_active: Actif
               field_parent_issue: Tâche parente
               field_visible: Visible
               field_warn_on_leaving_unsaved: "M'avertir lorsque je quitte une page contenant du texte non sauvegardé"
               field_issues_visibility: Visibilité des demandes
               field_is_private: Privée
               field_commit_logs_encoding: Encodage des messages de commit
               field_repository_is_default: Dépôt principal
               field_multiple: Valeurs multiples
               field_auth_source_ldap_filter: Filtre LDAP
               field_core_fields: Champs standards
               field_timeout: "Timeout (en secondes)"
               field_board_parent: Forum parent
               field_private_notes: Notes privées
               field_inherit_members: Hériter les membres
               field_generate_password: Générer un mot de passe
               setting_app_title: Titre de l'application
               setting_app_subtitle: Sous-titre de l'application
               setting_welcome_text: Texte d'accueil
               setting_default_language: Langue par défaut
               setting_login_required: Authentification obligatoire
               setting_self_registration: Inscription des nouveaux utilisateurs
               setting_attachment_max_size: Taille maximale des fichiers
               setting_issues_export_limit: Limite d'exportation des demandes
               setting_mail_from: Adresse d'émission
               setting_bcc_recipients: Destinataires en copie cachée (cci)
               setting_plain_text_mail: Mail en texte brut (non HTML)
               setting_host_name: Nom d'hôte et chemin
               setting_text_formatting: Formatage du texte
               setting_wiki_compression: Compression de l'historique des pages wiki
               setting_feeds_limit: Nombre maximal d'éléments dans les flux Atom
               setting_default_projects_public: Définir les nouveaux projets comme publics par défaut
               setting_autofetch_changesets: Récupération automatique des commits
               setting_sys_api_enabled: Activer les WS pour la gestion des dépôts
               setting_commit_ref_keywords: Mots-clés de référencement
               setting_commit_fix_keywords: Mots-clés de résolution
               setting_autologin: Durée maximale de connexion automatique
               setting_date_format: Format de date
               setting_time_format: Format d'heure
               setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
               setting_cross_project_subtasks: Autoriser les sous-tâches dans des projets différents
               setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
               setting_emails_footer: Pied-de-page des emails
               setting_protocol: Protocole
               setting_per_page_options: Options d'objets affichés par page
               setting_user_format: Format d'affichage des utilisateurs
               setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
               setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
               setting_enabled_scm: SCM activés
               setting_mail_handler_body_delimiters: "Tronquer les emails après l'une de ces lignes"
               setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
               setting_mail_handler_api_key: Clé de protection de l'API
               setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
               setting_gravatar_enabled: Afficher les Gravatar des utilisateurs
               setting_diff_max_lines_displayed: Nombre maximum de lignes de diff affichées
               setting_file_max_size_displayed: Taille maximum des fichiers texte affichés en ligne
               setting_repository_log_display_limit: "Nombre maximum de révisions affichées sur l'historique d'un fichier"
               setting_openid: "Autoriser l'authentification et l'enregistrement OpenID"
               setting_password_min_length: Longueur minimum des mots de passe
               setting_new_project_user_role_id: Rôle donné à un utilisateur non-administrateur qui crée un projet
               setting_default_projects_modules: Modules activés par défaut pour les nouveaux projets
               setting_issue_done_ratio: Calcul de l'avancement des demandes
               setting_issue_done_ratio_issue_status: Utiliser le statut
               setting_issue_done_ratio_issue_field: 'Utiliser le champ % effectué'
               setting_rest_api_enabled: Activer l'API REST
               setting_gravatar_default: Image Gravatar par défaut
               setting_start_of_week: Jour de début des calendriers
               setting_cache_formatted_text: Mettre en cache le texte formaté
               setting_commit_logtime_enabled: Permettre la saisie de temps
               setting_commit_logtime_activity_id: Activité pour le temps saisi
               setting_gantt_items_limit: Nombre maximum d'éléments affichés sur le gantt
               setting_issue_group_assignment: Permettre l'assignement des demandes aux groupes
               setting_default_issue_start_date_to_creation_date: Donner à la date de début d'une nouvelle demande la valeur de la date du jour
               setting_commit_cross_project_ref: Permettre le référencement et la résolution des demandes de tous les autres projets
               setting_unsubscribe: Permettre aux utilisateurs de supprimer leur propre compte
               setting_session_lifetime: Durée de vie maximale des sessions
               setting_session_timeout: Durée maximale d'inactivité
               setting_thumbnails_enabled: Afficher les vignettes des images
               setting_thumbnails_size: Taille des vignettes (en pixels)
               setting_non_working_week_days: Jours non travaillés
               setting_jsonp_enabled: Activer le support JSONP
               setting_default_projects_tracker_ids: Trackers par défaut pour les nouveaux projets
               permission_add_project: Créer un projet
               permission_add_subprojects: Créer des sous-projets
               permission_edit_project: Modifier le projet
               permission_close_project: Fermer / réouvrir le projet
               permission_select_project_modules: Choisir les modules
               permission_manage_members: Gérer les membres
               permission_manage_versions: Gérer les versions
               permission_manage_categories: Gérer les catégories de demandes
               permission_view_issues: Voir les demandes
               permission_add_issues: Créer des demandes
               permission_edit_issues: Modifier les demandes
               permission_manage_issue_relations: Gérer les relations
               permission_set_issues_private: Rendre les demandes publiques ou privées
               permission_set_own_issues_private: Rendre ses propres demandes publiques ou privées
               permission_add_issue_notes: Ajouter des notes
               permission_edit_issue_notes: Modifier les notes
               permission_edit_own_issue_notes: Modifier ses propres notes
               permission_view_private_notes: Voir les notes privées
               permission_set_notes_private: Rendre les notes privées
               permission_move_issues: Déplacer les demandes
               permission_delete_issues: Supprimer les demandes
               permission_manage_public_queries: Gérer les requêtes publiques
               permission_save_queries: Sauvegarder les requêtes
               permission_view_gantt: Voir le gantt
               permission_view_calendar: Voir le calendrier
               permission_view_issue_watchers: Voir la liste des observateurs
               permission_add_issue_watchers: Ajouter des observateurs
               permission_delete_issue_watchers: Supprimer des observateurs
               permission_log_time: Saisir le temps passé
               permission_view_time_entries: Voir le temps passé
               permission_edit_time_entries: Modifier les temps passés
               permission_edit_own_time_entries: Modifier son propre temps passé
               permission_manage_news: Gérer les annonces
               permission_comment_news: Commenter les annonces
               permission_view_documents: Voir les documents
               permission_add_documents: Ajouter des documents
               permission_edit_documents: Modifier les documents
               permission_delete_documents: Supprimer les documents
               permission_manage_files: Gérer les fichiers
               permission_view_files: Voir les fichiers
               permission_manage_wiki: Gérer le wiki
               permission_rename_wiki_pages: Renommer les pages
               permission_delete_wiki_pages: Supprimer les pages
               permission_view_wiki_pages: Voir le wiki
               permission_view_wiki_edits: "Voir l'historique des modifications"
               permission_edit_wiki_pages: Modifier les pages
               permission_delete_wiki_pages_attachments: Supprimer les fichiers joints
               permission_protect_wiki_pages: Protéger les pages
               permission_manage_repository: Gérer le dépôt de sources
               permission_browse_repository: Parcourir les sources
               permission_view_changesets: Voir les révisions
               permission_commit_access: Droit de commit
               permission_manage_boards: Gérer les forums
               permission_view_messages: Voir les messages
               permission_add_messages: Poster un message
               permission_edit_messages: Modifier les messages
               permission_edit_own_messages: Modifier ses propres messages
               permission_delete_messages: Supprimer les messages
               permission_delete_own_messages: Supprimer ses propres messages
               permission_export_wiki_pages: Exporter les pages
               permission_manage_project_activities: Gérer les activités
               permission_manage_subtasks: Gérer les sous-tâches
               permission_manage_related_issues: Gérer les demandes associées
               project_module_issue_tracking: Suivi des demandes
               project_module_time_tracking: Suivi du temps passé
               project_module_news: Publication d'annonces
               project_module_documents: Publication de documents
               project_module_files: Publication de fichiers
               project_module_wiki: Wiki
               project_module_repository: Dépôt de sources
               project_module_boards: Forums de discussion
               label_user: Utilisateur
               label_user_plural: Utilisateurs
               label_user_new: Nouvel utilisateur
               label_user_anonymous: Anonyme
               label_project: Projet
               label_project_new: Nouveau projet
               label_project_plural: Projets
               label_x_projects:
                 zero:  aucun projet
                 one:   un projet
                 other: "%{count} projets"
               label_project_all: Tous les projets
               label_project_latest: Derniers projets
               label_issue: Demande
               label_issue_new: Nouvelle demande
               label_issue_plural: Demandes
               label_issue_view_all: Voir toutes les demandes
               label_issue_added: Demande ajoutée
               label_issue_updated: Demande mise à jour
               label_issue_note_added: Note ajoutée
               label_issue_status_updated: Statut changé
               label_issue_priority_updated: Priorité changée
               label_issues_by: "Demandes par %{value}"
               label_document: Document
               label_document_new: Nouveau document
               label_document_plural: Documents
               label_document_added: Document ajouté
               label_role: Rôle
               label_role_plural: Rôles
               label_role_new: Nouveau rôle
               label_role_and_permissions: Rôles et permissions
               label_role_anonymous: Anonyme
               label_role_non_member: Non membre
               label_member: Membre
               label_member_new: Nouveau membre
               label_member_plural: Membres
               label_tracker: Tracker
               label_tracker_plural: Trackers
               label_tracker_new: Nouveau tracker
               label_workflow: Workflow
               label_issue_status: Statut de demandes
               label_issue_status_plural: Statuts de demandes
               label_issue_status_new: Nouveau statut
               label_issue_category: Catégorie de demandes
               label_issue_category_plural: Catégories de demandes
               label_issue_category_new: Nouvelle catégorie
               label_custom_field: Champ personnalisé
               label_custom_field_plural: Champs personnalisés
               label_custom_field_new: Nouveau champ personnalisé
               label_enumerations: Listes de valeurs
               label_enumeration_new: Nouvelle valeur
               label_information: Information
               label_information_plural: Informations
               label_please_login: Identification
               label_register: S'enregistrer
               label_login_with_open_id_option: S'authentifier avec OpenID
               label_password_lost: Mot de passe perdu
               label_home: Accueil
               label_my_page: Ma page
               label_my_account: Mon compte
               label_my_projects: Mes projets
               label_my_page_block: Blocs disponibles
               label_administration: Administration
               label_login: Connexion
               label_logout: Déconnexion
               label_help: Aide
               label_reported_issues: "Demandes soumises "
               label_assigned_to_me_issues: Demandes qui me sont assignées
               label_last_login: "Dernière connexion "
               label_registered_on: "Inscrit le "
               label_activity: Activité
               label_overall_activity: Activité globale
               label_user_activity: "Activité de %{value}"
               label_new: Nouveau
               label_logged_as: Connecté en tant que
               label_environment: Environnement
               label_authentication: Authentification
               label_auth_source: Mode d'authentification
               label_auth_source_new: Nouveau mode d'authentification
               label_auth_source_plural: Modes d'authentification
               label_subproject_plural: Sous-projets
               label_subproject_new: Nouveau sous-projet
               label_and_its_subprojects: "%{value} et ses sous-projets"
               label_min_max_length: Longueurs mini - maxi
               label_list: Liste
               label_date: Date
               label_integer: Entier
               label_float: Nombre décimal
               label_boolean: Booléen
               label_string: Texte
               label_text: Texte long
               label_attribute: Attribut
               label_attribute_plural: Attributs
               label_no_data: Aucune donnée à afficher
               label_change_status: Changer le statut
               label_history: Historique
               label_attachment: Fichier
               label_attachment_new: Nouveau fichier
               label_attachment_delete: Supprimer le fichier
               label_attachment_plural: Fichiers
               label_file_added: Fichier ajouté
               label_report: Rapport
               label_report_plural: Rapports
               label_news: Annonce
               label_news_new: Nouvelle annonce
               label_news_plural: Annonces
               label_news_latest: Dernières annonces
               label_news_view_all: Voir toutes les annonces
               label_news_added: Annonce ajoutée
               label_news_comment_added: Commentaire ajouté à une annonce
               label_settings: Configuration
               label_overview: Aperçu
               label_version: Version
               label_version_new: Nouvelle version
               label_version_plural: Versions
               label_confirmation: Confirmation
               label_export_to: 'Formats disponibles :'
               label_read: Lire...
               label_public_projects: Projets publics
               label_open_issues: ouvert
               label_open_issues_plural: ouverts
               label_closed_issues: fermé
               label_closed_issues_plural: fermés
               label_x_open_issues_abbr_on_total:
                 zero:  0 ouverte sur %{total}
                 one:   1 ouverte sur %{total}
                 other: "%{count} ouvertes sur %{total}"
               label_x_open_issues_abbr:
                 zero:  0 ouverte
                 one:   1 ouverte
                 other: "%{count} ouvertes"
               label_x_closed_issues_abbr:
                 zero:  0 fermée
                 one:   1 fermée
                 other: "%{count} fermées"
               label_x_issues:
                 zero:  0 demande
                 one:   1 demande
                 other: "%{count} demandes"
               label_total: Total
               label_total_time: Temps total
               label_permissions: Permissions
               label_current_status: Statut actuel
               label_new_statuses_allowed: Nouveaux statuts autorisés
               label_all: tous
               label_any: tous
               label_none: aucun
               label_nobody: personne
               label_next: Suivant
               label_previous: Précédent
               label_used_by: Utilisé par
               label_details: Détails
               label_add_note: Ajouter une note
               label_per_page: Par page
               label_calendar: Calendrier
               label_months_from: mois depuis
               label_gantt: Gantt
               label_internal: Interne
               label_last_changes: "%{count} derniers changements"
               label_change_view_all: Voir tous les changements
               label_personalize_page: Personnaliser cette page
               label_comment: Commentaire
               label_comment_plural: Commentaires
               label_x_comments:
                 zero: aucun commentaire
                 one: un commentaire
                 other: "%{count} commentaires"
               label_comment_add: Ajouter un commentaire
               label_comment_added: Commentaire ajouté
               label_comment_delete: Supprimer les commentaires
               label_query: Rapport personnalisé
               label_query_plural: Rapports personnalisés
               label_query_new: Nouveau rapport
               label_my_queries: Mes rapports personnalisés
               label_filter_add: "Ajouter le filtre "
               label_filter_plural: Filtres
               label_equals: égal
               label_not_equals: différent
               label_in_less_than: dans moins de
               label_in_more_than: dans plus de
               label_in_the_next_days: dans les prochains jours
               label_in_the_past_days: dans les derniers jours
               label_in: dans
               label_today: aujourd'hui
               label_all_time: toute la période
               label_yesterday: hier
               label_this_week: cette semaine
               label_last_week: la semaine dernière
               label_last_n_weeks: "les %{count} dernières semaines"
               label_last_n_days: "les %{count} derniers jours"
               label_this_month: ce mois-ci
               label_last_month: le mois dernier
               label_this_year: cette année
               label_date_range: Période
               label_less_than_ago: il y a moins de
               label_more_than_ago: il y a plus de
               label_ago: il y a
               label_contains: contient
               label_not_contains: ne contient pas
               label_any_issues_in_project: une demande du projet
               label_any_issues_not_in_project: une demande hors du projet
               label_no_issues_in_project: aucune demande du projet
               label_day_plural: jours
               label_repository: Dépôt
               label_repository_new: Nouveau dépôt
               label_repository_plural: Dépôts
               label_browse: Parcourir
               label_revision: "Révision "
               label_revision_plural: Révisions
               label_associated_revisions: Révisions associées
               label_added: ajouté
               label_modified: modifié
               label_copied: copié
               label_renamed: renommé
               label_deleted: supprimé
               label_latest_revision: Dernière révision
               label_latest_revision_plural: Dernières révisions
               label_view_revisions: Voir les révisions
               label_max_size: Taille maximale
               label_sort_highest: Remonter en premier
               label_sort_higher: Remonter
               label_sort_lower: Descendre
               label_sort_lowest: Descendre en dernier
               label_roadmap: Roadmap
               label_roadmap_due_in: "Échéance dans %{value}"
               label_roadmap_overdue: "En retard de %{value}"
               label_roadmap_no_issues: Aucune demande pour cette version
               label_search: "Recherche "
               label_result_plural: Résultats
               label_all_words: Tous les mots
               label_wiki: Wiki
               label_wiki_edit: Révision wiki
               label_wiki_edit_plural: Révisions wiki
               label_wiki_page: Page wiki
               label_wiki_page_plural: Pages wiki
               label_index_by_title: Index par titre
               label_index_by_date: Index par date
               label_current_version: Version actuelle
               label_preview: Prévisualisation
               label_feed_plural: Flux Atom
               label_changes_details: Détails de tous les changements
               label_issue_tracking: Suivi des demandes
               label_spent_time: Temps passé
               label_f_hour: "%{value} heure"
               label_f_hour_plural: "%{value} heures"
               label_time_tracking: Suivi du temps
               label_change_plural: Changements
               label_statistics: Statistiques
               label_commits_per_month: Commits par mois
               label_commits_per_author: Commits par auteur
               label_view_diff: Voir les différences
               label_diff_inline: en ligne
               label_diff_side_by_side: côte à côte
               label_options: Options
               label_copy_workflow_from: Copier le workflow de
               label_permissions_report: Synthèse des permissions
               label_watched_issues: Demandes surveillées
               label_related_issues: Demandes liées
               label_applied_status: Statut appliqué
               label_loading: Chargement...
               label_relation_new: Nouvelle relation
               label_relation_delete: Supprimer la relation
               label_relates_to: Lié à
               label_duplicates: Duplique
               label_duplicated_by: Dupliqué par
               label_blocks: Bloque
               label_blocked_by: Bloqué par
               label_precedes: Précède
               label_follows: Suit
               label_copied_to: Copié vers
               label_copied_from: Copié depuis
               label_end_to_start: fin à début
               label_end_to_end: fin à fin
               label_start_to_start: début à début
               label_start_to_end: début à fin
               label_stay_logged_in: Rester connecté
               label_disabled: désactivé
               label_show_completed_versions: Voir les versions passées
               label_me: moi
               label_board: Forum
               label_board_new: Nouveau forum
               label_board_plural: Forums
               label_topic_plural: Discussions
               label_message_plural: Messages
               label_message_last: Dernier message
               label_message_new: Nouveau message
               label_message_posted: Message ajouté
               label_reply_plural: Réponses
               label_send_information: Envoyer les informations à l'utilisateur
               label_year: Année
               label_month: Mois
               label_week: Semaine
               label_date_from: Du
               label_date_to: Au
               label_language_based: Basé sur la langue de l'utilisateur
               label_sort_by: "Trier par %{value}"
               label_send_test_email: Envoyer un email de test
               label_feeds_access_key_created_on: "Clé d'accès Atom créée il y a %{value}"
               label_module_plural: Modules
               label_added_time_by: "Ajouté par %{author} il y a %{age}"
               label_updated_time_by: "Mis à jour par %{author} il y a %{age}"
               label_updated_time: "Mis à jour il y a %{value}"
               label_jump_to_a_project: Aller à un projet...
               label_file_plural: Fichiers
               label_changeset_plural: Révisions
               label_default_columns: Colonnes par défaut
               label_no_change_option: (Pas de changement)
               label_bulk_edit_selected_issues: Modifier les demandes sélectionnées
               label_theme: Thème
               label_default: Défaut
               label_search_titles_only: Uniquement dans les titres
               label_user_mail_option_all: "Pour tous les événements de tous mes projets"
               label_user_mail_option_selected: "Pour tous les événements des projets sélectionnés..."
               label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements que j'effectue"
               label_registration_activation_by_email: activation du compte par email
               label_registration_manual_activation: activation manuelle du compte
               label_registration_automatic_activation: activation automatique du compte
               label_display_per_page: "Par page : %{value}"
               label_age: Âge
               label_change_properties: Changer les propriétés
               label_general: Général
               label_more: Plus
               label_scm: SCM
               label_plugins: Plugins
               label_ldap_authentication: Authentification LDAP
               label_downloads_abbr: D/L
               label_optional_description: Description facultative
               label_add_another_file: Ajouter un autre fichier
               label_preferences: Préférences
               label_chronological_order: Dans l'ordre chronologique
               label_reverse_chronological_order: Dans l'ordre chronologique inverse
               label_planning: Planning
               label_incoming_emails: Emails entrants
               label_generate_key: Générer une clé
               label_issue_watchers: Observateurs
               label_example: Exemple
               label_display: Affichage
               label_sort: Tri
               label_ascending: Croissant
               label_descending: Décroissant
               label_date_from_to: Du %{start} au %{end}
               label_wiki_content_added: Page wiki ajoutée
               label_wiki_content_updated: Page wiki mise à jour
               label_group_plural: Groupes
               label_group: Groupe
               label_group_new: Nouveau groupe
               label_time_entry_plural: Temps passé
               label_version_sharing_none: Non partagé
               label_version_sharing_descendants: Avec les sous-projets
               label_version_sharing_hierarchy: Avec toute la hiérarchie
               label_version_sharing_tree: Avec tout l'arbre
               label_version_sharing_system: Avec tous les projets
               label_copy_source: Source
               label_copy_target: Cible
               label_copy_same_as_target: Comme la cible
               label_update_issue_done_ratios: Mettre à jour l'avancement des demandes
               label_display_used_statuses_only: N'afficher que les statuts utilisés dans ce tracker
               label_api_access_key: Clé d'accès API
               label_api_access_key_created_on: Clé d'accès API créée il y a %{value}
               label_feeds_access_key: Clé d'accès Atom
               label_missing_api_access_key: Clé d'accès API manquante
               label_missing_feeds_access_key: Clé d'accès Atom manquante
               label_close_versions: Fermer les versions terminées
               label_revision_id: Révision %{value}
               label_profile: Profil
               label_subtask_plural: Sous-tâches
               label_project_copy_notifications: Envoyer les notifications durant la copie du projet
               label_principal_search: "Rechercher un utilisateur ou un groupe :"
               label_user_search: "Rechercher un utilisateur :"
               label_additional_workflow_transitions_for_author: Autorisations supplémentaires lorsque l'utilisateur a créé la demande
               label_additional_workflow_transitions_for_assignee: Autorisations supplémentaires lorsque la demande est assignée à l'utilisateur
               label_issues_visibility_all: Toutes les demandes
               label_issues_visibility_public: Toutes les demandes non privées
               label_issues_visibility_own: Demandes créées par ou assignées à l'utilisateur
               label_export_options: Options d'exportation %{export_format}
               label_copy_attachments: Copier les fichiers
               label_copy_subtasks: Copier les sous-tâches
               label_item_position: "%{position} sur %{count}"
               label_completed_versions: Versions passées
               label_session_expiration: Expiration des sessions
               label_show_closed_projects: Voir les projets fermés
               label_status_transitions: Changements de statut
               label_fields_permissions: Permissions sur les champs
               label_readonly: Lecture
               label_required: Obligatoire
               label_attribute_of_project: "%{name} du projet"
               label_attribute_of_issue: "%{name} de la demande"
               label_attribute_of_author: "%{name} de l'auteur"
               label_attribute_of_assigned_to: "%{name} de l'assigné"
               label_attribute_of_user: "%{name} de l'utilisateur"
               label_attribute_of_fixed_version: "%{name} de la version cible"
               label_cross_project_descendants: Avec les sous-projets
               label_cross_project_tree: Avec tout l'arbre
               label_cross_project_hierarchy: Avec toute la hiérarchie
               label_cross_project_system: Avec tous les projets
               label_gantt_progress_line: Ligne de progression
+              label_visibility_private: par moi uniquement
+              label_visibility_roles: par ces roles uniquement
+              label_visibility_public: par tout le monde
               button_login: Connexion
               button_submit: Soumettre
               button_save: Sauvegarder
               button_check_all: Tout cocher
               button_uncheck_all: Tout décocher
               button_collapse_all: Plier tout
               button_expand_all: Déplier tout
               button_delete: Supprimer
               button_create: Créer
               button_create_and_continue: Créer et continuer
               button_test: Tester
               button_edit: Modifier
               button_add: Ajouter
               button_change: Changer
               button_apply: Appliquer
               button_clear: Effacer
               button_lock: Verrouiller
               button_unlock: Déverrouiller
               button_download: Télécharger
               button_list: Lister
               button_view: Voir
               button_move: Déplacer
               button_move_and_follow: Déplacer et suivre
               button_back: Retour
               button_cancel: Annuler
               button_activate: Activer
               button_sort: Trier
               button_log_time: Saisir temps
               button_rollback: Revenir à cette version
               button_watch: Surveiller
               button_unwatch: Ne plus surveiller
               button_reply: Répondre
               button_archive: Archiver
               button_unarchive: Désarchiver
               button_reset: Réinitialiser
               button_rename: Renommer
               button_change_password: Changer de mot de passe
               button_copy: Copier
               button_copy_and_follow: Copier et suivre
               button_annotate: Annoter
               button_update: Mettre à jour
               button_configure: Configurer
               button_quote: Citer
               button_duplicate: Dupliquer
               button_show: Afficher
               button_hide: Cacher
               button_edit_section: Modifier cette section
               button_export: Exporter
               button_delete_my_account: Supprimer mon compte
               button_close: Fermer
               button_reopen: Réouvrir
               status_active: actif
               status_registered: enregistré
               status_locked: verrouillé
               project_status_active: actif
               project_status_closed: fermé
               project_status_archived: archivé
               version_status_open: ouvert
               version_status_locked: verrouillé
               version_status_closed: fermé
               text_select_mail_notifications: Actions pour lesquelles une notification par e-mail est envoyée
               text_regexp_info: ex. ^[A-Z0-9]+$
               text_min_max_length_info: 0 pour aucune restriction
               text_project_destroy_confirmation: Êtes-vous sûr de vouloir supprimer ce projet et toutes ses données ?
               text_subprojects_destroy_warning: "Ses sous-projets : %{value} seront également supprimés."
               text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
               text_are_you_sure: Êtes-vous sûr ?
               text_tip_issue_begin_day: tâche commençant ce jour
               text_tip_issue_end_day: tâche finissant ce jour
               text_tip_issue_begin_end_day: tâche commençant et finissant ce jour
               text_project_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres, tirets et underscore sont autorisés, doit commencer par une minuscule.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
               text_caracters_maximum: "%{count} caractères maximum."
               text_caracters_minimum: "%{count} caractères minimum."
               text_length_between: "Longueur comprise entre %{min} et %{max} caractères."
               text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
               text_unallowed_characters: Caractères non autorisés
               text_comma_separated: Plusieurs valeurs possibles (séparées par des virgules).
               text_line_separated: Plusieurs valeurs possibles (une valeur par ligne).
               text_issues_ref_in_commit_messages: Référencement et résolution des demandes dans les commentaires de commits
               text_issue_added: "La demande %{id} a été soumise par %{author}."
               text_issue_updated: "La demande %{id} a été mise à jour par %{author}."
               text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ?
               text_issue_category_destroy_question: "%{count} demandes sont affectées à cette catégorie. Que voulez-vous faire ?"
               text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
               text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
               text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)."
               text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne sont pas encore paramétrés.\nIl est vivement recommandé de charger le paramétrage par defaut. Vous pourrez le modifier une fois chargé."
               text_load_default_configuration: Charger le paramétrage par défaut
               text_status_changed_by_changeset: "Appliqué par commit %{value}."
               text_time_logged_by_changeset: "Appliqué par commit %{value}"
               text_issues_destroy_confirmation: 'Êtes-vous sûr de vouloir supprimer la ou les demandes(s) selectionnée(s) ?'
               text_issues_destroy_descendants_confirmation: "Cela entrainera également la suppression de %{count} sous-tâche(s)."
               text_select_project_modules: 'Sélectionner les modules à activer pour ce projet :'
               text_default_administrator_account_changed: Compte administrateur par défaut changé
               text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture
               text_plugin_assets_writable: Répertoire public des plugins accessible en écriture
               text_rmagick_available: Bibliothèque RMagick présente (optionnelle)
               text_destroy_time_entries_question: "%{hours} heures ont été enregistrées sur les demandes à supprimer. Que voulez-vous faire ?"
               text_destroy_time_entries: Supprimer les heures
               text_assign_time_entries_to_project: Reporter les heures sur le projet
               text_reassign_time_entries: 'Reporter les heures sur cette demande:'
               text_user_wrote: "%{value} a écrit :"
               text_enumeration_destroy_question: "Cette valeur est affectée à %{count} objets."
               text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
               text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/configuration.yml et redémarrez l'application pour les activer."
               text_repository_usernames_mapping: "Vous pouvez sélectionner ou modifier l'utilisateur Redmine associé à chaque nom d'utilisateur figurant dans l'historique du dépôt.\nLes utilisateurs avec le même identifiant ou la même adresse mail seront automatiquement associés."
               text_diff_truncated: '... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.'
               text_custom_field_possible_values_info: 'Une ligne par valeur'
               text_wiki_page_destroy_question: "Cette page possède %{descendants} sous-page(s) et descendante(s). Que voulez-vous faire ?"
               text_wiki_page_nullify_children: "Conserver les sous-pages en tant que pages racines"
               text_wiki_page_destroy_children: "Supprimer les sous-pages et toutes leurs descedantes"
               text_wiki_page_reassign_children: "Réaffecter les sous-pages à cette page"
               text_own_membership_delete_confirmation: "Vous allez supprimer tout ou partie de vos permissions sur ce projet et ne serez peut-être plus autorisé à modifier ce projet.\nEtes-vous sûr de vouloir continuer ?"
               text_warn_on_leaving_unsaved: "Cette page contient du texte non sauvegardé qui sera perdu si vous quittez la page."
               text_issue_conflict_resolution_overwrite: "Appliquer quand même ma mise à jour (les notes précédentes seront conservées mais des changements pourront être écrasés)"
               text_issue_conflict_resolution_add_notes: "Ajouter mes notes et ignorer mes autres changements"
               text_issue_conflict_resolution_cancel: "Annuler ma mise à jour et réafficher %{link}"
               text_account_destroy_confirmation: "Êtes-vous sûr de vouloir continuer ?\nVotre compte sera définitivement supprimé, sans aucune possibilité de le réactiver."
               text_session_expiration_settings: "Attention : le changement de ces paramètres peut entrainer l'expiration des sessions utilisateurs en cours, y compris la vôtre."
               text_project_closed: Ce projet est fermé et accessible en lecture seule.
               text_turning_multiple_off: "Si vous désactivez les valeurs multiples, les valeurs multiples seront supprimées pour n'en conserver qu'une par objet."
               default_role_manager: "Manager "
               default_role_developer: "Développeur "
               default_role_reporter: "Rapporteur "
               default_tracker_bug: Anomalie
               default_tracker_feature: Evolution
               default_tracker_support: Assistance
               default_issue_status_new: Nouveau
               default_issue_status_in_progress: En cours
               default_issue_status_resolved: Résolu
               default_issue_status_feedback: Commentaire
               default_issue_status_closed: Fermé
               default_issue_status_rejected: Rejeté
               default_doc_category_user: Documentation utilisateur
               default_doc_category_tech: Documentation technique
               default_priority_low: Bas
               default_priority_normal: Normal
               default_priority_high: Haut
               default_priority_urgent: Urgent
               default_priority_immediate: Immédiat
               default_activity_design: Conception
               default_activity_development: Développement
               enumeration_issue_priorities: Priorités des demandes
               enumeration_doc_categories: Catégories des documents
               enumeration_activities: Activités (suivi du temps)
               label_greater_or_equal: ">="
               label_less_or_equal: "<="
               label_between: entre
               label_view_all_revisions: Voir toutes les révisions
               label_tag: Tag
               label_branch: Branche
               error_no_tracker_in_project: "Aucun tracker n'est associé à ce projet. Vérifier la configuration du projet."
               error_no_default_issue_status: "Aucun statut de demande n'est défini par défaut. Vérifier votre configuration (Administration -> Statuts de demandes)."
               text_journal_changed: "%{label} changé de %{old} à %{new}"
               text_journal_changed_no_detail: "%{label} mis à jour"
               text_journal_set_to: "%{label} mis à %{value}"
               text_journal_deleted: "%{label} %{old} supprimé"
               text_journal_added: "%{label} %{value} ajouté"
               enumeration_system_activity: Activité système
               label_board_sticky: Sticky
               label_board_locked: Verrouillé
               error_unable_delete_issue_status: Impossible de supprimer le statut de demande
               error_can_not_delete_custom_field: Impossible de supprimer le champ personnalisé
               error_unable_to_connect: Connexion impossible (%{value})
               error_can_not_remove_role: Ce rôle est utilisé et ne peut pas être supprimé.
               error_can_not_delete_tracker: Ce tracker contient des demandes et ne peut pas être supprimé.
               field_principal: Principal
               notice_failed_to_save_members: "Erreur lors de la sauvegarde des membres: %{errors}."
               text_zoom_out: Zoom arrière
               text_zoom_in: Zoom avant
               notice_unable_delete_time_entry: Impossible de supprimer le temps passé.
               label_overall_spent_time: Temps passé global
               field_time_entries: Temps passé
               project_module_gantt: Gantt
               project_module_calendar: Calendrier
               button_edit_associated_wikipage: "Modifier la page wiki associée: %{page_title}"
               field_text: Champ texte
               label_user_mail_option_only_owner: Seulement pour ce que j'ai créé
               setting_default_notification_option: Option de notification par défaut
               label_user_mail_option_only_my_events: Seulement pour ce que je surveille
               label_user_mail_option_only_assigned: Seulement pour ce qui m'est assigné
               label_user_mail_option_none: Aucune notification
               field_member_of_group: Groupe de l'assigné
               field_assigned_to_role: Rôle de l'assigné
               setting_emails_header: En-tête des emails
               label_bulk_edit_selected_time_entries: Modifier les temps passés sélectionnés
               text_time_entries_destroy_confirmation: "Etes-vous sûr de vouloir supprimer les temps passés sélectionnés ?"
               field_scm_path_encoding: Encodage des chemins
               text_scm_path_encoding_note: "Défaut : UTF-8"
               field_path_to_repository: Chemin du dépôt
               field_root_directory: Répertoire racine
               field_cvs_module: Module
               field_cvsroot: CVSROOT
               text_mercurial_repository_note: "Dépôt local (exemples : /hgrepo, c:\\hgrepo)"
               text_scm_command: Commande
               text_scm_command_version: Version
               label_git_report_last_commit: Afficher le dernier commit des fichiers et répertoires
               text_scm_config: Vous pouvez configurer les commandes des SCM dans config/configuration.yml. Redémarrer l'application après modification.
               text_scm_command_not_available: Ce SCM n'est pas disponible. Vérifier les paramètres dans la section administration.
               label_diff: diff
               text_git_repository_note: Repository is bare and local (e.g. /gitrepo, c:\gitrepo)
               description_query_sort_criteria_direction: Ordre de tri
               description_project_scope: Périmètre de recherche
               description_filter: Filtre
               description_user_mail_notification: Option de notification
               description_date_from: Date de début
               description_message_content: Contenu du message
               description_available_columns: Colonnes disponibles
               description_all_columns: Toutes les colonnes
               description_date_range_interval: Choisir une période
               description_issue_category_reassign: Choisir une catégorie
               description_search: Champ de recherche
               description_notes: Notes
               description_date_range_list: Choisir une période prédéfinie
               description_choose_project: Projets
               description_date_to: Date de fin
               description_query_sort_criteria_attribute: Critère de tri
               description_wiki_subpages_reassign: Choisir une nouvelle page parent
               description_selected_columns: Colonnes sélectionnées
               label_parent_revision: Parent
               label_child_revision: Enfant
               error_scm_annotate_big_text_file: Cette entrée ne peut pas être annotée car elle excède la taille maximale.
               setting_repositories_encodings: Encodages des fichiers et des dépôts
               label_search_for_watchers: Rechercher des observateurs
               text_repository_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres, tirets et underscore sont autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'

public/stylesheets/application.css +2 0

             html {overflow-y:scroll;}
             body { font-family: Verdana, sans-serif; font-size: 12px; color:#484848; margin: 0; padding: 0; min-width: 900px; }
             h1, h2, h3, h4 {font-family: "Trebuchet MS", Verdana, sans-serif;padding: 2px 10px 1px 0px;margin: 0 0 10px 0;}
             #content h1, h2, h3, h4 {color: #555;}
             h2, .wiki h1 {font-size: 20px;}
             h3, .wiki h2 {font-size: 16px;}
             h4, .wiki h3 {font-size: 13px;}
             h4 {border-bottom: 1px dotted #bbb;}
             /***** Layout *****/
             #wrapper {background: white;}
             #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
             #top-menu ul {margin: 0;  padding: 0;}
             #top-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 0px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #top-menu a {color: #fff; margin-right: 8px; font-weight: bold;}
             #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
             #account {float:right;}
             #header {min-height:5.3em;margin:0;background-color:#628DB6;color:#f8f8f8; padding: 4px 8px 20px 6px; position:relative;}
             #header a {color:#f8f8f8;}
             #header h1 a.ancestor { font-size: 80%; }
             #quick-search {float:right;}
             #main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
             #main-menu ul {margin: 0;  padding: 0;}
             #main-menu li {
               float:left;
               list-style-type:none;
               margin: 0px 2px 0px 0px;
               padding: 0px 0px 0px 0px;
               white-space:nowrap;
             }
             #main-menu li a {
               display: block;
               color: #fff;
               text-decoration: none;
               font-weight: bold;
               margin: 0;
               padding: 4px 10px 4px 10px;
             }
             #main-menu li a:hover {background:#759FCF; color:#fff;}
             #main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
             #admin-menu ul {margin: 0;  padding: 0;}
             #admin-menu li {margin: 0;  padding: 0 0 6px 0; list-style-type:none;}
             #admin-menu a { background-position: 0% 40%; background-repeat: no-repeat; padding-left: 20px; padding-top: 2px; padding-bottom: 3px;}
             #admin-menu a.projects { background-image: url(../images/projects.png); }
             #admin-menu a.users { background-image: url(../images/user.png); }
             #admin-menu a.groups { background-image: url(../images/group.png); }
             #admin-menu a.roles { background-image: url(../images/database_key.png); }
             #admin-menu a.trackers { background-image: url(../images/ticket.png); }
             #admin-menu a.issue_statuses { background-image: url(../images/ticket_edit.png); }
             #admin-menu a.workflows { background-image: url(../images/ticket_go.png); }
             #admin-menu a.custom_fields { background-image: url(../images/textfield.png); }
             #admin-menu a.enumerations { background-image: url(../images/text_list_bullets.png); }
             #admin-menu a.settings { background-image: url(../images/changeset.png); }
             #admin-menu a.plugins { background-image: url(../images/plugin.png); }
             #admin-menu a.info { background-image: url(../images/help.png); }
             #admin-menu a.server_authentication { background-image: url(../images/server_key.png); }
             #main {background-color:#EEEEEE;}
             #sidebar{ float: right; width: 22%; position: relative; z-index: 9; padding: 0; margin: 0;}
             * html #sidebar{ width: 22%; }
             #sidebar h3{ font-size: 14px; margin-top:14px; color: #666;  }
             #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
             * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
             #sidebar .contextual { margin-right: 1em; }
             #sidebar ul {margin: 0;  padding: 0;}
             #sidebar ul li {list-style-type:none;margin: 0px 2px 0px 0px; padding: 0px 0px 0px 0px;}
             #content { width: 75%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; }
             * html #content{ width: 75%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
             html>body #content { min-height: 600px; }
             * html body #content { height: 600px; } /* IE */
             #main.nosidebar #sidebar{ display: none; }
             #main.nosidebar #content{ width: auto; border-right: 0; }
             #footer {clear: both; border-top: 1px solid #bbb; font-size: 0.9em; color: #aaa; padding: 5px; text-align:center; background:#fff;}
             #login-form table {margin-top:5em; padding:1em; margin-left: auto; margin-right: auto; border: 2px solid #FDBF3B; background-color:#FFEBC1; }
             #login-form table td {padding: 6px;}
             #login-form label {font-weight: bold;}
             #login-form input#username, #login-form input#password { width: 300px; }
             div.modal { border-radius:5px; background:#fff; z-index:50; padding:4px;}
             div.modal h3.title {display:none;}
             div.modal p.buttons {text-align:right; margin-bottom:0;}
             input#openid_url { background: url(../images/openid-bg.gif) no-repeat; background-color: #fff; background-position: 0 50%; padding-left: 18px; }
             .clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
             /***** Links *****/
             a, a:link, a:visited{ color: #169; text-decoration: none; }
             a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
             a img{ border: 0; }
             a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
             a.project.closed, a.project.closed:link, a.project.closed:visited { color: #999; }
             a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
             #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
             #sidebar a.selected:hover {text-decoration:none;}
             #admin-menu a {line-height:1.7em;}
             #admin-menu a.selected {padding-left: 20px !important; background-position: 2px 40%;}
             a.collapsible {padding-left: 12px; background: url(../images/arrow_expanded.png) no-repeat -3px 40%;}
             a.collapsible.collapsed {background: url(../images/arrow_collapsed.png) no-repeat -5px 40%;}
             a#toggle-completed-versions {color:#999;}
             /***** Tables *****/
             table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
             table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
             table.list td { vertical-align: top; padding-right:10px; }
             table.list td.id { width: 2%; text-align: center;}
             table.list td.checkbox { width: 15px; padding: 2px 0 0 0; }
             table.list td.checkbox input {padding:0px;}
             table.list td.buttons { width: 15%; white-space:nowrap; text-align: right; }
             table.list td.buttons a { padding-right: 0.6em; }
             table.list caption { text-align: left; padding: 0.5em 0.5em 0.5em 0; }
             tr.project td.name a { white-space:nowrap; }
             tr.project.closed, tr.project.archived { color: #aaa; }
             tr.project.closed a, tr.project.archived a { color: #aaa; }
             tr.project.idnt td.name span {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.project.idnt-1 td.name {padding-left: 0.5em;}
             tr.project.idnt-2 td.name {padding-left: 2em;}
             tr.project.idnt-3 td.name {padding-left: 3.5em;}
             tr.project.idnt-4 td.name {padding-left: 5em;}
             tr.project.idnt-5 td.name {padding-left: 6.5em;}
             tr.project.idnt-6 td.name {padding-left: 8em;}
             tr.project.idnt-7 td.name {padding-left: 9.5em;}
             tr.project.idnt-8 td.name {padding-left: 11em;}
             tr.project.idnt-9 td.name {padding-left: 12.5em;}
             tr.issue { text-align: center; white-space: nowrap; }
             tr.issue td.subject, tr.issue td.category, td.assigned_to, tr.issue td.string, tr.issue td.text, tr.issue td.relations { white-space: normal; }
             tr.issue td.subject, tr.issue td.relations { text-align: left; }
             tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
             tr.issue td.relations span {white-space: nowrap;}
             table.issues td.description {color:#777; font-size:90%; padding:4px 4px 4px 24px; text-align:left; white-space:normal;}
             table.issues td.description pre {white-space:normal;}
             tr.issue.idnt td.subject a {background: url(../images/bullet_arrow_right.png) no-repeat 0 50%; padding-left: 16px;}
             tr.issue.idnt-1 td.subject {padding-left: 0.5em;}
             tr.issue.idnt-2 td.subject {padding-left: 2em;}
             tr.issue.idnt-3 td.subject {padding-left: 3.5em;}
             tr.issue.idnt-4 td.subject {padding-left: 5em;}
             tr.issue.idnt-5 td.subject {padding-left: 6.5em;}
             tr.issue.idnt-6 td.subject {padding-left: 8em;}
             tr.issue.idnt-7 td.subject {padding-left: 9.5em;}
             tr.issue.idnt-8 td.subject {padding-left: 11em;}
             tr.issue.idnt-9 td.subject {padding-left: 12.5em;}
             tr.entry { border: 1px solid #f8f8f8; }
             tr.entry td { white-space: nowrap; }
             tr.entry td.filename { width: 30%; }
             tr.entry td.filename_no_report { width: 70%; }
             tr.entry td.size { text-align: right; font-size: 90%; }
             tr.entry td.revision, tr.entry td.author { text-align: center; }
             tr.entry td.age { text-align: right; }
             tr.entry.file td.filename a { margin-left: 16px; }
             tr.entry.file td.filename_no_report a { margin-left: 16px; }
             tr span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
             tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
             tr.changeset { height: 20px }
             tr.changeset ul, ol { margin-top: 0px; margin-bottom: 0px; }
             tr.changeset td.revision_graph { width: 15%; background-color: #fffffb; }
             tr.changeset td.author { text-align: center; width: 15%; white-space:nowrap;}
             tr.changeset td.committed_on { text-align: center; width: 15%; white-space:nowrap;}
             table.files tr.file td { text-align: center; }
             table.files tr.file td.filename { text-align: left; padding-left: 24px; }
             table.files tr.file td.digest { font-size: 80%; }
             table.members td.roles, table.memberships td.roles { width: 45%; }
             tr.message { height: 2.6em; }
             tr.message td.subject { padding-left: 20px; }
             tr.message td.created_on { white-space: nowrap; }
             tr.message td.last_message { font-size: 80%; white-space: nowrap; }
             tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
             tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
             tr.version.closed, tr.version.closed a { color: #999; }
             tr.version td.name { padding-left: 20px; }
             tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
             tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
             tr.user td { width:13%; }
             tr.user td.email { width:18%; }
             tr.user td { white-space: nowrap; }
             tr.user.locked, tr.user.registered { color: #aaa; }
             tr.user.locked a, tr.user.registered a { color: #aaa; }
             table.permissions td.role {color:#999;font-size:90%;font-weight:normal !important;text-align:center;vertical-align:bottom;}
             tr.wiki-page-version td.updated_on, tr.wiki-page-version td.author {text-align:center;}
             tr.time-entry { text-align: center; white-space: nowrap; }
             tr.time-entry td.issue, tr.time-entry td.comments { text-align: left; white-space: normal; }
             td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
             td.hours .hours-dec { font-size: 0.9em; }
             table.plugins td { vertical-align: middle; }
             table.plugins td.configure { text-align: right; padding-right: 1em; }
             table.plugins span.name { font-weight: bold; display: block; margin-bottom: 6px; }
             table.plugins span.description { display: block; font-size: 0.9em; }
             table.plugins span.url { display: block; font-size: 0.9em; }
             table.list tbody tr.group td { padding: 0.8em 0 0.5em 0.3em; font-weight: bold; border-bottom: 1px solid #ccc; }
             table.list tbody tr.group span.count {position:relative; top:-1px; color:#fff; font-size:10px; background:#9DB9D5; padding:0px 6px 1px 6px; border-radius:3px; margin-left:4px;}
             tr.group a.toggle-all { color: #aaa; font-size: 80%; font-weight: normal; display:none;}
             tr.group:hover a.toggle-all { display:inline;}
             a.toggle-all:hover {text-decoration:none;}
             table.list tbody tr:hover { background-color:#ffffdd; }
             table.list tbody tr.group:hover { background-color:inherit; }
             table td {padding:2px;}
             table p {margin:0;}
             .odd {background-color:#f6f7f8;}
             .even {background-color: #fff;}
             a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat: no-repeat; }
             a.sort.asc  { background-image: url(../images/sort_asc.png); }
             a.sort.desc { background-image: url(../images/sort_desc.png); }
             table.attributes { width: 100% }
             table.attributes th { vertical-align: top; text-align: left; }
             table.attributes td { vertical-align: top; }
             table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
             table.boards td.topic-count, table.boards td.message-count {text-align:center;}
             table.boards td.last-message {font-size:80%;}
             table.messages td.author, table.messages td.created_on, table.messages td.reply-count {text-align:center;}
             table.query-columns {
               border-collapse: collapse;
               border: 0;
             }
             table.query-columns td.buttons {
               vertical-align: middle;
               text-align: center;
             }
             td.center {text-align:center;}
             h3.version { background: url(../images/package.png) no-repeat 0% 50%; padding-left: 20px; }
             div.issues h3 { background: url(../images/ticket.png) no-repeat 0% 50%; padding-left: 20px; }
             div.members h3 { background: url(../images/group.png) no-repeat 0% 50%; padding-left: 20px; }
             div.news h3 { background: url(../images/news.png) no-repeat 0% 50%; padding-left: 20px; }
             div.projects h3 { background: url(../images/projects.png) no-repeat 0% 50%; padding-left: 20px; }
             #watchers select {width: 95%; display: block;}
             #watchers a.delete {opacity: 0.4; vertical-align: middle;}
             #watchers a.delete:hover {opacity: 1;}
             #watchers img.gravatar {margin: 0 4px 2px 0;}
             span#watchers_inputs {overflow:auto; display:block;}
             span.search_for_watchers {display:block;}
             span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
             span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
             .highlight { background-color: #FCFD8D;}
             .highlight.token-1 { background-color: #faa;}
             .highlight.token-2 { background-color: #afa;}
             .highlight.token-3 { background-color: #aaf;}
             .box{
               padding:6px;
               margin-bottom: 10px;
               background-color:#f6f6f6;
               color:#505050;
               line-height:1.5em;
               border: 1px solid #e4e4e4;
             }
             div.square {
               border: 1px solid #999;
               float: left;
               margin: .3em .4em 0 .4em;
               overflow: hidden;
               width: .6em; height: .6em;
             }
             .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
             .contextual input, .contextual select {font-size:0.9em;}
             .message .contextual { margin-top: 0; }
             .splitcontent {overflow:auto;}
             .splitcontentleft{float:left; width:49%;}
             .splitcontentright{float:right; width:49%;}
             form {display: inline;}
             input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
             fieldset {border: 1px solid #e4e4e4; margin:0;}
             legend {color: #484848;}
             hr { width: 100%; height: 1px; background: #ccc; border: 0;}
             blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
             blockquote blockquote { margin-left: 0;}
             acronym  { border-bottom: 1px dotted; cursor: help; }
             textarea.wiki-edit {width:99%; resize:vertical;}
             li p {margin-top: 0;}
             div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
             p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
             p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; }
             p.footnote { font-size: 0.9em; margin-top: 0px; margin-bottom: 0px; }
             div.issue div.subject div div { padding-left: 16px; }
             div.issue div.subject p {margin: 0; margin-bottom: 0.1em; font-size: 90%; color: #999;}
             div.issue div.subject>div>p { margin-top: 0.5em; }
             div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;}
             div.issue span.private { position:relative; bottom: 2px; text-transform: uppercase; background: #d22; color: #fff; font-weight:bold; padding: 0px 2px 0px 2px; font-size: 60%; margin-right: 2px; border-radius: 2px;}
             div.issue .next-prev-links {color:#999;}
             div.issue table.attributes th {width:22%;}
             div.issue table.attributes td {width:28%;}
             #issue_tree table.issues, #relations table.issues { border: 0; }
             #issue_tree td.checkbox, #relations td.checkbox {display:none;}
             #relations td.buttons {padding:0;}
             fieldset.collapsible { border-width: 1px 0 0 0; font-size: 0.9em; }
             fieldset.collapsible>legend { padding-left: 16px; background: url(../images/arrow_expanded.png) no-repeat 0% 40%; cursor:pointer; }
             fieldset.collapsible.collapsed>legend { background-image: url(../images/arrow_collapsed.png); }
             fieldset#date-range p { margin: 2px 0 2px 0; }
             fieldset#filters table { border-collapse: collapse; }
             fieldset#filters table td { padding: 0; vertical-align: middle; }
             fieldset#filters tr.filter { height: 2.1em; }
             fieldset#filters td.field { width:230px; }
             fieldset#filters td.operator { width:180px; }
             fieldset#filters td.operator select {max-width:170px;}
             fieldset#filters td.values { white-space:nowrap; }
             fieldset#filters td.values select {min-width:130px;}
             fieldset#filters td.values input {height:1em;}
             fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
             .toggle-multiselect {background: url(../images/bullet_toggle_plus.png) no-repeat 0% 40%; padding-left:8px; margin-left:0; cursor:pointer;}
             .buttons { font-size: 0.9em; margin-bottom: 1.4em; margin-top: 1em; }
             div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
             div#issue-changesets div.changeset { padding: 4px;}
             div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
             div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
             .journal ul.details img {margin:0 0 -3px 4px;}
             div.journal {overflow:auto;}
             div.journal.private-notes {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
             div#activity dl, #search-results { margin-left: 2em; }
             div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
             div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
             div#activity dt.me .time { border-bottom: 1px solid #999; }
             div#activity dt .time { color: #777; font-size: 80%; }
             div#activity dd .description, #search-results dd .description { font-style: italic; }
             div#activity span.project:after, #search-results span.project:after { content: " -"; }
             div#activity dd span.description, #search-results dd span.description { display:block; color: #808080; }
             div#activity dt.grouped {margin-left:5em;}
             div#activity dd.grouped {margin-left:9em;}
             #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
             div#search-results-counts {float:right;}
             div#search-results-counts ul { margin-top: 0.5em; }
             div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
             dt.issue { background-image: url(../images/ticket.png); }
             dt.issue-edit { background-image: url(../images/ticket_edit.png); }
             dt.issue-closed { background-image: url(../images/ticket_checked.png); }
             dt.issue-note { background-image: url(../images/ticket_note.png); }
             dt.changeset { background-image: url(../images/changeset.png); }
             dt.news { background-image: url(../images/news.png); }
             dt.message { background-image: url(../images/message.png); }
             dt.reply { background-image: url(../images/comments.png); }
             dt.wiki-page { background-image: url(../images/wiki_edit.png); }
             dt.attachment { background-image: url(../images/attachment.png); }
             dt.document { background-image: url(../images/document.png); }
             dt.project { background-image: url(../images/projects.png); }
             dt.time-entry { background-image: url(../images/time.png); }
             #search-results dt.issue.closed { background-image: url(../images/ticket_checked.png); }
             div#roadmap .related-issues { margin-bottom: 1em; }
             div#roadmap .related-issues td.checkbox { display: none; }
             div#roadmap .wiki h1:first-child { display: none; }
             div#roadmap .wiki h1 { font-size: 120%; }
             div#roadmap .wiki h2 { font-size: 110%; }
             body.controller-versions.action-show div#roadmap .related-issues {width:70%;}
             div#version-summary { float:right; width:28%; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
             div#version-summary fieldset { margin-bottom: 1em; }
             div#version-summary fieldset.time-tracking table { width:100%; }
             div#version-summary th, div#version-summary td.total-hours { text-align: right; }
             table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
             table#time-report tbody tr.subtotal { font-style: italic; color:#777;}
             table#time-report tbody tr.subtotal td.hours { color:#b0b0b0; }
             table#time-report tbody tr.total { font-weight: bold; background-color:#EEEEEE; border-top:1px solid #e4e4e4;}
             table#time-report .hours-dec { font-size: 0.9em; }
             div.wiki-page .contextual a {opacity: 0.4}
             div.wiki-page .contextual a:hover {opacity: 1}
             form .attributes select { width: 60%; }
             input#issue_subject { width: 99%; }
             select#issue_done_ratio { width: 95px; }
             ul.projects {margin:0; padding-left:1em;}
             ul.projects ul {padding-left:1.6em;}
             ul.projects.root {margin:0; padding:0;}
             ul.projects li {list-style-type:none;}
             #projects-index ul.projects ul.projects { border-left: 3px solid #e0e0e0; padding-left:1em;}
             #projects-index ul.projects li.root {margin-bottom: 1em;}
             #projects-index ul.projects li.child {margin-top: 1em;}
             #projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
             .my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
             #notified-projects ul, #tracker_project_ids ul {max-height:250px; overflow-y:auto;}
             #related-issues li img {vertical-align:middle;}
             ul.properties {padding:0; font-size: 0.9em; color: #777;}
             ul.properties li {list-style-type:none;}
             ul.properties li span {font-style:italic;}
             .total-hours { font-size: 110%; font-weight: bold; }
             .total-hours span.hours-int { font-size: 120%; }
             .autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
             #user_login, #user_firstname, #user_lastname, #user_mail, #my_account_form select, #user_form select, #user_identity_url { width: 90%; }
             #workflow_copy_form select { width: 200px; }
             table.transitions td.enabled {background: #bfb;}
             table.fields_permissions select {font-size:90%}
             table.fields_permissions td.readonly {background:#ddd;}
             table.fields_permissions td.required {background:#d88;}
             textarea#custom_field_possible_values {width: 99%}
             textarea#custom_field_default_value {width: 99%}
             input#content_comments {width: 99%}
             p.pagination {margin-top:8px; font-size: 90%}
             /***** Tabular forms ******/
             .tabular p{
               margin: 0;
               padding: 3px 0 3px 0;
               padding-left: 180px; /* width of left column containing the label elements */
               min-height: 1.8em;
               clear:left;
             }
             html>body .tabular p {overflow:hidden;}
             .tabular label{
               font-weight: bold;
               float: left;
               text-align: right;
               /* width of left column */
               margin-left: -180px;
               /* width of labels. Should be smaller than left column to create some right margin */
               width: 175px;
             }
             .tabular label.floating{
               font-weight: normal;
               margin-left: 0px;
               text-align: left;
               width: 270px;
             }
             .tabular label.block{
               font-weight: normal;
               margin-left: 0px !important;
               text-align: left;
               float: none;
               display: block;
               width: auto;
             }
             .tabular label.inline{
               font-weight: normal;
               float:none;
               margin-left: 5px !important;
               width: auto;
             }
             label.no-css {
               font-weight: inherit;
               float:none;
               text-align:left;
               margin-left:0px;
               width:auto;
             }
             input#time_entry_comments { width: 90%;}
             #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
             .tabular.settings p{ padding-left: 300px; }
             .tabular.settings label{ margin-left: -300px; width: 295px; }
             .tabular.settings textarea { width: 99%; }
             .settings.enabled_scm table {width:100%}
             .settings.enabled_scm td.scm_name{ font-weight: bold; }
             fieldset.settings label { display: block; }
             fieldset#notified_events .parent { padding-left: 20px; }
             span.required {color: #bb0000;}
             .summary {font-style: italic;}
             #attachments_fields input.description {margin-left:4px; width:340px;}
             #attachments_fields span {display:block; white-space:nowrap;}
             #attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
             #attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
             #attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
             #attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
             a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
             a.remove-upload:hover {text-decoration:none !important;}
             div.fileover { background-color: lavender; }
             div.attachments { margin-top: 12px; }
             div.attachments p { margin:4px 0 2px 0; }
             div.attachments img { vertical-align: middle; }
             div.attachments span.author { font-size: 0.9em; color: #888; }
             div.thumbnails {margin-top:0.6em;}
             div.thumbnails div {background:#fff;border:2px solid #ddd;display:inline-block;margin-right:2px;}
             div.thumbnails img {margin: 3px;}
             p.other-formats { text-align: right; font-size:0.9em; color: #666; }
             .other-formats span + span:before { content: "| "; }
             a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
             em.info {font-style:normal;font-size:90%;color:#888;display:block;}
             em.info.error {padding-left:20px; background:url(../images/exclamation.png) no-repeat 0 50%;}
             textarea.text_cf {width:90%;}
             #tab-content-modules fieldset p {margin:3px 0 4px 0;}
             #tab-content-members .splitcontentleft, #tab-content-memberships .splitcontentleft, #tab-content-users .splitcontentleft {width: 64%;}
             #tab-content-members .splitcontentright, #tab-content-memberships .splitcontentright, #tab-content-users .splitcontentright {width: 34%;}
             #tab-content-members fieldset, #tab-content-memberships fieldset, #tab-content-users fieldset {padding:1em; margin-bottom: 1em;}
             #tab-content-members fieldset legend, #tab-content-memberships fieldset legend, #tab-content-users fieldset legend {font-weight: bold;}
             #tab-content-members fieldset label, #tab-content-memberships fieldset label, #tab-content-users fieldset label {display: block;}
             #tab-content-members #principals, #tab-content-users #principals {max-height: 400px; overflow: auto;}
             #tab-content-memberships .splitcontentright select {width:90%}
             #users_for_watcher {height: 200px; overflow:auto;}
             #users_for_watcher label {display: block;}
             table.members td.group { padding-left: 20px; background: url(../images/group.png) no-repeat 0% 50%; }
             input#principal_search, input#user_search {width:90%}
             input.autocomplete {
               background: #fff url(../images/magnifier.png) no-repeat 2px 50%; padding-left:20px;
               border:1px solid #9EB1C2; border-radius:2px; height:1.5em;
             }
             input.autocomplete.ajax-loading {
               background-image: url(../images/loading.gif);
             }
+            .role-visibility {padding-left:2em;}
             /***** Flash & error messages ****/
             #errorExplanation, div.flash, .nodata, .warning, .conflict {
               padding: 4px 4px 4px 30px;
               margin-bottom: 12px;
               font-size: 1.1em;
               border: 2px solid;
             }
             div.flash {margin-top: 8px;}
             div.flash.error, #errorExplanation {
               background: url(../images/exclamation.png) 8px 50% no-repeat;
               background-color: #ffe3e3;
               border-color: #dd0000;
               color: #880000;
             }
             div.flash.notice {
               background: url(../images/true.png) 8px 5px no-repeat;
               background-color: #dfffdf;
               border-color: #9fcf9f;
               color: #005f00;
             }
             div.flash.warning, .conflict {
               background: url(../images/warning.png) 8px 5px no-repeat;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
               text-align: left;
             }
             .nodata, .warning {
               text-align: center;
               background-color: #FFEBC1;
               border-color: #FDBF3B;
               color: #A6750C;
             }
             #errorExplanation ul { font-size: 0.9em;}
             #errorExplanation h2, #errorExplanation p { display: none; }
             .conflict-details {font-size:80%;}
             /***** Ajax indicator ******/
             #ajax-indicator {
             position: absolute; /* fixed not supported by IE */
             background-color:#eee;
             border: 1px solid #bbb;
             top:35%;
             left:40%;
             width:20%;
             font-weight:bold;
             text-align:center;
             padding:0.6em;
             z-index:100;
             opacity: 0.5;
             }
             html>body #ajax-indicator { position: fixed; }
             #ajax-indicator span {
             background-position: 0% 40%;
             background-repeat: no-repeat;
             background-image: url(../images/loading.gif);
             padding-left: 26px;
             vertical-align: bottom;
             }
             /***** Calendar *****/
             table.cal {border-collapse: collapse; width: 100%; margin: 0px 0 6px 0;border: 1px solid #d7d7d7;}
             table.cal thead th {width: 14%; background-color:#EEEEEE; padding: 4px; }
             table.cal thead th.week-number {width: auto;}
             table.cal tbody tr {height: 100px;}
             table.cal td {border: 1px solid #d7d7d7; vertical-align: top; font-size: 0.9em;}
             table.cal td.week-number { background-color:#EEEEEE; padding: 4px; border:none; font-size: 1em;}
             table.cal td p.day-num {font-size: 1.1em; text-align:right;}
             table.cal td.odd p.day-num {color: #bbb;}
             table.cal td.today {background:#ffffdd;}
             table.cal td.today p.day-num {font-weight: bold;}
             table.cal .starting a, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .ending a, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
             table.cal .starting.ending a, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
             p.cal.legend span {display:block;}
             /***** Tooltips ******/
             .tooltip{position:relative;z-index:24;}
             .tooltip:hover{z-index:25;color:#000;}
             .tooltip span.tip{display: none; text-align:left;}
             div.tooltip:hover span.tip{
             display:block;
             position:absolute;
             top:12px; left:24px; width:270px;
             border:1px solid #555;
             background-color:#fff;
             padding: 4px;
             font-size: 0.8em;
             color:#505050;
             }
             img.ui-datepicker-trigger {
               cursor: pointer;
               vertical-align: middle;
               margin-left: 4px;
             }
             /***** Progress bar *****/
             table.progress {
               border-collapse: collapse;
               border-spacing: 0pt;
               empty-cells: show;
               text-align: center;
               float:left;
               margin: 1px 6px 1px 0px;
             }
             table.progress td { height: 1em; }
             table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
             table.progress td.done { background: #D3EDD3 none repeat scroll 0%; }
             table.progress td.todo { background: #eee none repeat scroll 0%; }
             p.percent {font-size: 80%;}
             p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;}
             #roadmap table.progress td { height: 1.2em; }
             /***** Tabs *****/
             #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;}
             #content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width: 2000px; border-bottom: 1px solid #bbbbbb;}
             #content .tabs ul li {
               float:left;
               list-style-type:none;
               white-space:nowrap;
               margin-right:4px;
               background:#fff;
               position:relative;
               margin-bottom:-1px;
             }
             #content .tabs ul li a{
               display:block;
               font-size: 0.9em;
               text-decoration:none;
               line-height:1.3em;
               padding:4px 6px 4px 6px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               background-color: #f6f6f6;
               color:#999;
               font-weight:bold;
               border-top-left-radius:3px;
               border-top-right-radius:3px;
             }
             #content .tabs ul li a:hover {
               background-color: #ffffdd;
               text-decoration:none;
             }
             #content .tabs ul li a.selected {
               background-color: #fff;
               border: 1px solid #bbbbbb;
               border-bottom: 1px solid #fff;
               color:#444;
             }
             #content .tabs ul li a.selected:hover {background-color: #fff;}
             div.tabs-buttons { position:absolute; right: 0; width: 48px; height: 24px; background: white; bottom: 0; border-bottom: 1px solid #bbbbbb; }
             button.tab-left, button.tab-right {
               font-size: 0.9em;
               cursor: pointer;
               height:24px;
               border: 1px solid #ccc;
               border-bottom: 1px solid #bbbbbb;
               position:absolute;
               padding:4px;
               width: 20px;
               bottom: -1px;
             }
             button.tab-left {
               right: 20px;
               background: #eeeeee url(../images/bullet_arrow_left.png) no-repeat 50% 50%;
               border-top-left-radius:3px;
             }
             button.tab-right {
               right: 0;
               background: #eeeeee url(../images/bullet_arrow_right.png) no-repeat 50% 50%;
               border-top-right-radius:3px;
             }
             /***** Diff *****/
             .diff_out { background: #fcc; }
             .diff_out span { background: #faa; }
             .diff_in { background: #cfc; }
             .diff_in span { background: #afa; }
             .text-diff {
               padding: 1em;
               background-color:#f6f6f6;
               color:#505050;
               border: 1px solid #e4e4e4;
             }
             /***** Wiki *****/
             div.wiki table {
               border-collapse: collapse;
               margin-bottom: 1em;
             }
             div.wiki table, div.wiki td, div.wiki th {
               border: 1px solid #bbb;
               padding: 4px;
             }
             div.wiki .noborder, div.wiki .noborder td, div.wiki .noborder th {border:0;}
             div.wiki .external {
               background-position: 0% 60%;
               background-repeat: no-repeat;
               padding-left: 12px;
               background-image: url(../images/external.png);
             }
             div.wiki a.new {color: #b73535;}
             div.wiki ul, div.wiki ol {margin-bottom:1em;}
             div.wiki pre {
               margin: 1em 1em 1em 1.6em;
               padding: 8px;
               background-color: #fafafa;
               border: 1px solid #e2e2e2;
               width:auto;
               overflow-x: auto;
               overflow-y: hidden;
             }
             div.wiki ul.toc {
               background-color: #ffffdd;
               border: 1px solid #e4e4e4;
               padding: 4px;
               line-height: 1.2em;
               margin-bottom: 12px;
               margin-right: 12px;
               margin-left: 0;
               display: table
             }
             * html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
             div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
             div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
             div.wiki ul.toc ul { margin: 0; padding: 0; }
             div.wiki ul.toc li {list-style-type:none; margin: 0; font-size:12px;}
             div.wiki ul.toc li li {margin-left: 1.5em; font-size:10px;}
             div.wiki ul.toc a {
               font-size: 0.9em;
               font-weight: normal;
               text-decoration: none;
               color: #606060;
             }
             div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
             a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
             a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
             h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
             div.wiki img { vertical-align: middle; }
             /***** My page layout *****/
             .block-receiver {
               border:1px dashed #c0c0c0;
               margin-bottom: 20px;
               padding: 15px 0 15px 0;
             }
             .mypage-box {
               margin:0 0 20px 0;
               color:#505050;
               line-height:1.5em;
             }
             .handle {cursor: move;}
             a.close-icon {
               display:block;
               margin-top:3px;
               overflow:hidden;
               width:12px;
               height:12px;
               background-repeat: no-repeat;
               cursor:pointer;
               background-image:url('../images/close.png');
             }
             a.close-icon:hover {background-image:url('../images/close_hl.png');}
             /***** Gantt chart *****/
             .gantt_hdr {
               position:absolute;
               top:0;
               height:16px;
               border-top: 1px solid #c0c0c0;
               border-bottom: 1px solid #c0c0c0;
               border-right: 1px solid #c0c0c0;
               text-align: center;
               overflow: hidden;
             }
             .gantt_hdr.nwday {background-color:#f1f1f1;}
             .gantt_subjects { font-size: 0.8em; }
             .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
             .task {
               position: absolute;
               height:8px;
               font-size:0.8em;
               color:#888;
               padding:0;
               margin:0;
               line-height:16px;
               white-space:nowrap;
             }
             .task.label {width:100%;}
             .task.label.project, .task.label.version { font-weight: bold; }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .task_todo { background:#aaa url(../images/task_todo.png); border: 1px solid #aaa; }
             .task_todo.parent { background: #888; border: 1px solid #888; height: 3px;}
             .task_late.parent, .task_done.parent { height: 3px;}
             .task.parent.marker.starting  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; left: 0px; top: -1px;}
             .task.parent.marker.ending { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -4px; right: 0px; top: -1px;}
             .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .project.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
             .project.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
             .project.marker { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; margin-left: -4px; margin-top: 1px; }
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}
             /***** Icons *****/
             .icon {
               background-position: 0% 50%;
               background-repeat: no-repeat;
               padding-left: 20px;
               padding-top: 2px;
               padding-bottom: 3px;
             }
             .icon-add { background-image: url(../images/add.png); }
             .icon-edit { background-image: url(../images/edit.png); }
             .icon-copy { background-image: url(../images/copy.png); }
             .icon-duplicate { background-image: url(../images/duplicate.png); }
             .icon-del { background-image: url(../images/delete.png); }
             .icon-move { background-image: url(../images/move.png); }
             .icon-save { background-image: url(../images/save.png); }
             .icon-cancel { background-image: url(../images/cancel.png); }
             .icon-multiple { background-image: url(../images/table_multiple.png); }
             .icon-folder { background-image: url(../images/folder.png); }
             .open .icon-folder { background-image: url(../images/folder_open.png); }
             .icon-package { background-image: url(../images/package.png); }
             .icon-user { background-image: url(../images/user.png); }
             .icon-projects { background-image: url(../images/projects.png); }
             .icon-help { background-image: url(../images/help.png); }
             .icon-attachment  { background-image: url(../images/attachment.png); }
             .icon-history  { background-image: url(../images/history.png); }
             .icon-time  { background-image: url(../images/time.png); }
             .icon-time-add  { background-image: url(../images/time_add.png); }
             .icon-stats  { background-image: url(../images/stats.png); }
             .icon-warning  { background-image: url(../images/warning.png); }
             .icon-fav  { background-image: url(../images/fav.png); }
             .icon-fav-off  { background-image: url(../images/fav_off.png); }
             .icon-reload  { background-image: url(../images/reload.png); }
             .icon-lock  { background-image: url(../images/locked.png); }
             .icon-unlock  { background-image: url(../images/unlock.png); }
             .icon-checked  { background-image: url(../images/true.png); }
             .icon-details  { background-image: url(../images/zoom_in.png); }
             .icon-report  { background-image: url(../images/report.png); }
             .icon-comment  { background-image: url(../images/comment.png); }
             .icon-summary  { background-image: url(../images/lightning.png); }
             .icon-server-authentication { background-image: url(../images/server_key.png); }
             .icon-issue { background-image: url(../images/ticket.png); }
             .icon-zoom-in { background-image: url(../images/zoom_in.png); }
             .icon-zoom-out { background-image: url(../images/zoom_out.png); }
             .icon-passwd { background-image: url(../images/textfield_key.png); }
             .icon-test { background-image: url(../images/bullet_go.png); }
             .icon-file { background-image: url(../images/files/default.png); }
             .icon-file.text-plain { background-image: url(../images/files/text.png); }
             .icon-file.text-x-c { background-image: url(../images/files/c.png); }
             .icon-file.text-x-csharp { background-image: url(../images/files/csharp.png); }
             .icon-file.text-x-java { background-image: url(../images/files/java.png); }
             .icon-file.text-x-javascript { background-image: url(../images/files/js.png); }
             .icon-file.text-x-php { background-image: url(../images/files/php.png); }
             .icon-file.text-x-ruby { background-image: url(../images/files/ruby.png); }
             .icon-file.text-xml { background-image: url(../images/files/xml.png); }
             .icon-file.text-css { background-image: url(../images/files/css.png); }
             .icon-file.text-html { background-image: url(../images/files/html.png); }
             .icon-file.image-gif { background-image: url(../images/files/image.png); }
             .icon-file.image-jpeg { background-image: url(../images/files/image.png); }
             .icon-file.image-png { background-image: url(../images/files/image.png); }
             .icon-file.image-tiff { background-image: url(../images/files/image.png); }
             .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
             .icon-file.application-zip { background-image: url(../images/files/zip.png); }
             .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
             img.gravatar {
               padding: 2px;
               border: solid 1px #d5d5d5;
               background: #fff;
               vertical-align: middle;
             }
             div.issue img.gravatar {
               float: left;
               margin: 0 6px 0 0;
               padding: 5px;
             }
             div.issue table img.gravatar {
               height: 14px;
               width: 14px;
               padding: 2px;
               float: left;
               margin: 0 0.5em 0 0;
             }
             h2 img.gravatar {margin: -2px 4px -4px 0;}
             h3 img.gravatar {margin: -4px 4px -4px 0;}
             h4 img.gravatar {margin: -6px 4px -4px 0;}
             td.username img.gravatar {margin: 0 0.5em 0 0; vertical-align: top;}
             #activity dt img.gravatar {float: left; margin: 0 1em 1em 0;}
             /* Used on 12px Gravatar img tags without the icon background */
             .icon-gravatar {float: left; margin-right: 4px;}
             #activity dt, .journal {clear: left;}
             .journal-link {float: right;}
             h2 img { vertical-align:middle; }
             .hascontextmenu { cursor: context-menu; }
             /* Custom JQuery styles */
             .ui-datepicker-title select {width:70px !important; margin-top:-2px !important; margin-right:4px !important;}
             /************* CodeRay styles *************/
             .syntaxhl div {display: inline;}
             .syntaxhl .line-numbers {padding: 2px 4px 2px 4px; background-color: #eee; margin:0px 5px 0px 0px;}
             .syntaxhl .code pre { overflow: auto }
             .syntaxhl .debug { color: white !important; background: blue !important; }
             .syntaxhl .annotation { color:#007 }
             .syntaxhl .attribute-name { color:#b48 }
             .syntaxhl .attribute-value { color:#700 }
             .syntaxhl .binary { color:#509 }
             .syntaxhl .char .content { color:#D20 }
             .syntaxhl .char .delimiter { color:#710 }
             .syntaxhl .char { color:#D20 }
             .syntaxhl .class { color:#258; font-weight:bold }
             .syntaxhl .class-variable { color:#369 }
             .syntaxhl .color { color:#0A0 }
             .syntaxhl .comment { color:#385 }
             .syntaxhl .comment .char { color:#385 }
             .syntaxhl .comment .delimiter { color:#385 }
             .syntaxhl .complex { color:#A08 }
             .syntaxhl .constant { color:#258; font-weight:bold }
             .syntaxhl .decorator { color:#B0B }
             .syntaxhl .definition { color:#099; font-weight:bold }
             .syntaxhl .delimiter { color:black }
             .syntaxhl .directive { color:#088; font-weight:bold }
             .syntaxhl .doc { color:#970 }
             .syntaxhl .doc-string { color:#D42; font-weight:bold }
             .syntaxhl .doctype { color:#34b }
             .syntaxhl .entity { color:#800; font-weight:bold }
             .syntaxhl .error { color:#F00; background-color:#FAA }
             .syntaxhl .escape  { color:#666 }
             .syntaxhl .exception { color:#C00; font-weight:bold }
             .syntaxhl .float { color:#06D }
             .syntaxhl .function { color:#06B; font-weight:bold }
             .syntaxhl .global-variable { color:#d70 }
             .syntaxhl .hex { color:#02b }
             .syntaxhl .imaginary { color:#f00 }
             .syntaxhl .include { color:#B44; font-weight:bold }
             .syntaxhl .inline { background-color: hsla(0,0%,0%,0.07); color: black }
             .syntaxhl .inline-delimiter { font-weight: bold; color: #666 }
             .syntaxhl .instance-variable { color:#33B }
             .syntaxhl .integer  { color:#06D }
             .syntaxhl .key .char { color: #60f }
             .syntaxhl .key .delimiter { color: #404 }
             .syntaxhl .key { color: #606 }
             .syntaxhl .keyword { color:#939; font-weight:bold }
             .syntaxhl .label { color:#970; font-weight:bold }
             .syntaxhl .local-variable { color:#963 }
             .syntaxhl .namespace { color:#707; font-weight:bold }
             .syntaxhl .octal { color:#40E }
             .syntaxhl .operator { }
             .syntaxhl .predefined { color:#369; font-weight:bold }
             .syntaxhl .predefined-constant { color:#069 }
             .syntaxhl .predefined-type { color:#0a5; font-weight:bold }
             .syntaxhl .preprocessor { color:#579 }
             .syntaxhl .pseudo-class { color:#00C; font-weight:bold }
             .syntaxhl .regexp .content { color:#808 }
             .syntaxhl .regexp .delimiter { color:#404 }
             .syntaxhl .regexp .modifier { color:#C2C }
             .syntaxhl .regexp { background-color:hsla(300,100%,50%,0.06); }
             .syntaxhl .reserved { color:#080; font-weight:bold }
             .syntaxhl .shell .content { color:#2B2 }
             .syntaxhl .shell .delimiter { color:#161 }
             .syntaxhl .shell { background-color:hsla(120,100%,50%,0.06); }
             .syntaxhl .string .char { color: #46a }
             .syntaxhl .string .content { color: #46a }
             .syntaxhl .string .delimiter { color: #46a }
             .syntaxhl .string .modifier { color: #46a }
             .syntaxhl .symbol .content { color:#d33 }
             .syntaxhl .symbol .delimiter { color:#d33 }
             .syntaxhl .symbol { color:#d33 }
             .syntaxhl .tag { color:#070 }
             .syntaxhl .type { color:#339; font-weight:bold }
             .syntaxhl .value { color: #088; }
             .syntaxhl .variable  { color:#037 }
             .syntaxhl .insert { background: hsla(120,100%,50%,0.12) }
             .syntaxhl .delete { background: hsla(0,100%,50%,0.12) }
             .syntaxhl .change { color: #bbf; background: #007; }
             .syntaxhl .head { color: #f8f; background: #505 }
             .syntaxhl .head .filename { color: white; }
             .syntaxhl .delete .eyecatcher { background-color: hsla(0,100%,50%,0.2); border: 1px solid hsla(0,100%,45%,0.5); margin: -1px; border-bottom: none; border-top-left-radius: 5px; border-top-right-radius: 5px; }
             .syntaxhl .insert .eyecatcher { background-color: hsla(120,100%,50%,0.2); border: 1px solid hsla(120,100%,25%,0.5); margin: -1px; border-top: none; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; }
             .syntaxhl .insert .insert { color: #0c0; background:transparent; font-weight:bold }
             .syntaxhl .delete .delete { color: #c00; background:transparent; font-weight:bold }
             .syntaxhl .change .change { color: #88f }
             .syntaxhl .head .head { color: #f4f }
             /***** Media print specific styles *****/
             @media print {
               #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
               #main { background: #fff; }
               #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; overflow: visible !important;}
               #wiki_add_attachment { display:none; }
               .hide-when-print { display: none; }
               .autoscroll {overflow-x: visible;}
               table.list {margin-top:0.5em;}
               table.list th, table.list td {border: 1px solid #aaa;}
             }
             /* Accessibility specific styles */
             .hidden-for-sighted {
               position:absolute;
               left:-10000px;
               top:auto;
               width:1px;
               height:1px;
               overflow:hidden;
             }

test/fixtures/queries.yml +9 -9

             ---
             queries_001:
               id: 1
               type: IssueQuery
               project_id: 1
-              is_public: true
+              visibility: 2
               name: Multiple custom fields query
               filters: |
                 ---
                 cf_1:
                   :values:
                   - MySQL
                   :operator: "="
                 status_id:
                   :values:
                   - "1"
                   :operator: o
                 cf_2:
                   :values:
                   - "125"
                   :operator: "="
               user_id: 1
               column_names:
             queries_002:
               id: 2
               type: IssueQuery
               project_id: 1
-              is_public: false
+              visibility: 0
               name: Private query for cookbook
               filters: |
                 ---
                 tracker_id:
                   :values:
                   - "3"
                   :operator: "="
                 status_id:
                   :values:
                   - "1"
                   :operator: o
               user_id: 3
               column_names:
             queries_003:
               id: 3
               type: IssueQuery
               project_id:
-              is_public: false
+              visibility: 0
               name: Private query for all projects
               filters: |
                 ---
                 tracker_id:
                   :values:
                   - "3"
                   :operator: "="
               user_id: 3
               column_names:
             queries_004:
               id: 4
               type: IssueQuery
               project_id:
-              is_public: true
+              visibility: 2
               name: Public query for all projects
               filters: |
                 ---
                 tracker_id:
                   :values:
                   - "3"
                   :operator: "="
               user_id: 2
               column_names:
             queries_005:
               id: 5
               type: IssueQuery
               project_id:
-              is_public: true
+              visibility: 2
               name: Open issues by priority and tracker
               filters: |
                 ---
                 status_id:
                   :values:
                   - "1"
                   :operator: o
               user_id: 1
               column_names:
               sort_criteria: |
                 ---
                 - - priority
                   - desc
                 - - tracker
                   - asc
             queries_006:
               id: 6
               type: IssueQuery
               project_id:
-              is_public: true
+              visibility: 2
               name: Open issues grouped by tracker
               filters: |
                 ---
                 status_id:
                   :values:
                   - "1"
                   :operator: o
               user_id: 1
               column_names:
               group_by: tracker
               sort_criteria: |
                 ---
                 - - priority
                   - desc
             queries_007:
               id: 7
               type: IssueQuery
               project_id: 2
-              is_public: true
+              visibility: 2
               name: Public query for project 2
               filters: |
                 ---
                 tracker_id:
                   :values:
                   - "3"
                   :operator: "="
               user_id: 2
               column_names:
             queries_008:
               id: 8
               type: IssueQuery
               project_id: 2
-              is_public: false
+              visibility: 0
               name: Private query for project 2
               filters: |
                 ---
                 tracker_id:
                   :values:
                   - "3"
                   :operator: "="
               user_id: 2
               column_names:
             queries_009:
               id: 9
               type: IssueQuery
               project_id:
-              is_public: true
+              visibility: 2
               name: Open issues grouped by list custom field
               filters: |
                 ---
                 status_id:
                   :values:
                   - "1"
                   :operator: o
               user_id: 1
               column_names:
               group_by: cf_1
               sort_criteria: |
                 ---
                 - - priority
                   - desc

test/functional/calendars_controller_test.rb +1 -1

             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             require File.expand_path('../../test_helper', __FILE__)
             class CalendarsControllerTest < ActionController::TestCase
               fixtures :projects,
                        :trackers,
                        :projects_trackers,
                        :roles,
                        :member_roles,
                        :members,
                        :enabled_modules
               def test_show
                 get :show, :project_id => 1
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_show_should_run_custom_queries
-                @query = IssueQuery.create!(:name => 'Calendar', :is_public => true)
+                @query = IssueQuery.create!(:name => 'Calendar', :visibility => IssueQuery::VISIBILITY_PUBLIC)
                 get :show, :query_id => @query.id
                 assert_response :success
               end
               def test_cross_project_calendar
                 get :show
                 assert_response :success
                 assert_template 'calendar'
                 assert_not_nil assigns(:calendar)
               end
               def test_week_number_calculation
                 Setting.start_of_week = 7
                 get :show, :month => '1', :year => '2010'
                 assert_response :success
                 assert_select 'tr' do
                   assert_select 'td.week-number', :text => '53'
                   assert_select 'td.odd', :text => '27'
                   assert_select 'td.even', :text => '2'
                 end
                 assert_select 'tr' do
                   assert_select 'td.week-number', :text => '1'
                   assert_select 'td.odd', :text => '3'
                   assert_select 'td.even', :text => '9'
                 end
                 Setting.start_of_week = 1
                 get :show, :month => '1', :year => '2010'
                 assert_response :success
                 assert_select 'tr' do
                   assert_select 'td.week-number', :text => '53'
                   assert_select 'td.even', :text => '28'
                   assert_select 'td.even', :text => '3'
                 end
                 assert_select 'tr' do
                   assert_select 'td.week-number', :text => '1'
                   assert_select 'td.even', :text => '4'
                   assert_select 'td.even', :text => '10'
                 end
               end
             end

test/functional/issues_controller_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

test/functional/queries_controller_test.rb +12 -22

             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             require File.expand_path('../../test_helper', __FILE__)
             class QueriesControllerTest < ActionController::TestCase
               fixtures :projects, :users, :members, :member_roles, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries, :enabled_modules
               def setup
                 User.current = nil
               end
               def test_index
                 get :index
                 # HTML response not implemented
                 assert_response 406
               end
               def test_new_project_query
                 @request.session[:user_id] = 2
                 get :new, :project_id => 1
                 assert_response :success
                 assert_template 'new'
-                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[name=?][value=0][checked=checked]', 'query[visibility]'
-                                                             :name => 'query[is_public]',
-                                                             :checked => nil }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'query_is_for_all',
                                                              :checked => nil,
                                                              :disabled => nil }
                 assert_select 'select[name=?]', 'c[]' do
                   assert_select 'option[value=tracker]'
                   assert_select 'option[value=subject]'
                 end
               end
               def test_new_global_query
                 @request.session[:user_id] = 2
                 get :new
                 assert_response :success
                 assert_template 'new'
-                assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[name=?]', 'query[visibility]', 0
-                                                                :name => 'query[is_public]' }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'query_is_for_all',
                                                              :checked => 'checked',
                                                              :disabled => nil }
               end
               def test_new_on_invalid_project
                 @request.session[:user_id] = 2
                 get :new, :project_id => 'invalid'
                 assert_response 404
               end
               def test_create_project_public_query
                 @request.session[:user_id] = 2
                 post :create,
                      :project_id => 'ecookbook',
                      :default_columns => '1',
                      :f => ["status_id", "assigned_to_id"],
                      :op => {"assigned_to_id" => "=", "status_id" => "o"},
                      :v => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-                     :query => {"name" => "test_new_project_public_query", "is_public" => "1"}
+                     :query => {"name" => "test_new_project_public_query", "visibility" => "2"}
                 q = Query.find_by_name('test_new_project_public_query')
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
                 assert q.is_public?
                 assert q.has_default_columns?
                 assert q.valid?
               end
               def test_create_project_private_query
                 @request.session[:user_id] = 3
                 post :create,
                      :project_id => 'ecookbook',
                      :default_columns => '1',
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-                     :query => {"name" => "test_new_project_private_query", "is_public" => "1"}
+                     :query => {"name" => "test_new_project_private_query", "visibility" => "2"}
                 q = Query.find_by_name('test_new_project_private_query')
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :query_id => q
                 assert !q.is_public?
                 assert q.has_default_columns?
                 assert q.valid?
               end
               def test_create_global_private_query_with_custom_columns
                 @request.session[:user_id] = 3
                 post :create,
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
-                     :query => {"name" => "test_new_global_private_query", "is_public" => "1"},
+                     :query => {"name" => "test_new_global_private_query", "visibility" => "2"},
                      :c => ["", "tracker", "subject", "priority", "category"]
                 q = Query.find_by_name('test_new_global_private_query')
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q
                 assert !q.is_public?
                 assert !q.has_default_columns?
                 assert_equal [:id, :tracker, :subject, :priority, :category], q.columns.collect {|c| c.name}
                 assert q.valid?
               end
               def test_create_global_query_with_custom_filters
                 @request.session[:user_id] = 3
                 post :create,
                      :fields => ["assigned_to_id"],
                      :operators => {"assigned_to_id" => "="},
                      :values => { "assigned_to_id" => ["me"]},
                      :query => {"name" => "test_new_global_query"}
                 q = Query.find_by_name('test_new_global_query')
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => nil, :query_id => q
                 assert !q.has_filter?(:status_id)
                 assert_equal ['assigned_to_id'], q.filters.keys
                 assert q.valid?
               end
               def test_create_with_sort
                 @request.session[:user_id] = 1
                 post :create,
                      :default_columns => '1',
                      :operators => {"status_id" => "o"},
                      :values => {"status_id" => ["1"]},
                      :query => {:name => "test_new_with_sort",
-                                :is_public => "1",
+                                :visibility => "2",
                                 :sort_criteria => {"0" => ["due_date", "desc"], "1" => ["tracker", ""]}}
                 query = Query.find_by_name("test_new_with_sort")
                 assert_not_nil query
                 assert_equal [['due_date', 'desc'], ['tracker', 'asc']], query.sort_criteria
               end
               def test_create_with_failure
                 @request.session[:user_id] = 2
                 assert_no_difference '::Query.count' do
                   post :create, :project_id => 'ecookbook', :query => {:name => ''}
                 end
                 assert_response :success
                 assert_template 'new'
                 assert_select 'input[name=?]', 'query[name]'
               end
               def test_edit_global_public_query
                 @request.session[:user_id] = 1
                 get :edit, :id => 4
                 assert_response :success
                 assert_template 'edit'
-                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[name=?][value=2][checked=checked]', 'query[visibility]'
-                                                             :name => 'query[is_public]',
-                                                             :checked => 'checked' }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'query_is_for_all',
                                                              :checked => 'checked',
                                                              :disabled => 'disabled' }
               end
               def test_edit_global_private_query
                 @request.session[:user_id] = 3
                 get :edit, :id => 3
                 assert_response :success
                 assert_template 'edit'
-                assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[name=?]', 'query[visibility]', 0
-                                                                :name => 'query[is_public]' }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'query_is_for_all',
                                                              :checked => 'checked',
                                                              :disabled => 'disabled' }
               end
               def test_edit_project_private_query
                 @request.session[:user_id] = 3
                 get :edit, :id => 2
                 assert_response :success
                 assert_template 'edit'
-                assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[name=?]', 'query[visibility]', 0
-                                                                :name => 'query[is_public]' }
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'query_is_for_all',
                                                              :checked => nil,
                                                              :disabled => nil }
               end
               def test_edit_project_public_query
                 @request.session[:user_id] = 2
                 get :edit, :id => 1
                 assert_response :success
                 assert_template 'edit'
-                assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                assert_select 'input[name=?][value=2][checked=checked]', 'query[visibility]'
-                                                             :name => 'query[is_public]',
-                                                             :checked => 'checked'
                 assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
                                                              :name => 'query_is_for_all',
                                                              :checked => nil,
                                                              :disabled => 'disabled' }
               end
               def test_edit_sort_criteria
                 @request.session[:user_id] = 1
                 get :edit, :id => 5
                 assert_response :success
                 assert_template 'edit'
                 assert_tag :tag => 'select', :attributes => { :name => 'query[sort_criteria][0][]' },
                                              :child => { :tag => 'option', :attributes => { :value => 'priority',
                                                                                             :selected => 'selected' } }
                 assert_tag :tag => 'select', :attributes => { :name => 'query[sort_criteria][0][]' },
                                              :child => { :tag => 'option', :attributes => { :value => 'desc',
                                                                                             :selected => 'selected' } }
               end
               def test_edit_invalid_query
                 @request.session[:user_id] = 2
                 get :edit, :id => 99
                 assert_response 404
               end
               def test_udpate_global_private_query
                 @request.session[:user_id] = 3
                 put :update,
                      :id => 3,
                      :default_columns => '1',
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
-                     :query => {"name" => "test_edit_global_private_query", "is_public" => "1"}
+                     :query => {"name" => "test_edit_global_private_query", "visibility" => "2"}
                 assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3
                 q = Query.find_by_name('test_edit_global_private_query')
                 assert !q.is_public?
                 assert q.has_default_columns?
                 assert q.valid?
               end
               def test_update_global_public_query
                 @request.session[:user_id] = 1
                 put :update,
                      :id => 4,
                      :default_columns => '1',
                      :fields => ["status_id", "assigned_to_id"],
                      :operators => {"assigned_to_id" => "=", "status_id" => "o"},
                      :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-                     :query => {"name" => "test_edit_global_public_query", "is_public" => "1"}
+                     :query => {"name" => "test_edit_global_public_query", "visibility" => "2"}
                 assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4
                 q = Query.find_by_name('test_edit_global_public_query')
                 assert q.is_public?
                 assert q.has_default_columns?
                 assert q.valid?
               end
               def test_update_with_failure
                 @request.session[:user_id] = 1
                 put :update, :id => 4, :query => {:name => ''}
                 assert_response :success
                 assert_template 'edit'
               end
               def test_destroy
                 @request.session[:user_id] = 2
                 delete :destroy, :id => 1
                 assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :set_filter => 1, :query_id => nil
                 assert_nil Query.find_by_id(1)
               end
               def test_backslash_should_be_escaped_in_filters
                 @request.session[:user_id] = 2
                 get :new, :subject => 'foo/bar'
                 assert_response :success
                 assert_template 'new'
                 assert_include 'addFilter("subject", "=", ["foo\/bar"]);', response.body
               end
             end

test/unit/query_test.rb +66 0

             # Redmine - project management software
             # Copyright (C) 2006-2013  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.
             require File.expand_path('../../test_helper', __FILE__)
             class QueryTest < ActiveSupport::TestCase
               include Redmine::I18n
               fixtures :projects, :enabled_modules, :users, :members,
                        :member_roles, :roles, :trackers, :issue_statuses,
                        :issue_categories, :enumerations, :issues,
                        :watchers, :custom_fields, :custom_values, :versions,
                        :queries,
                        :projects_trackers,
                        :custom_fields_trackers
+              def test_query_with_roles_visibility_should_validate_roles
+                set_language_if_valid 'en'
+                query = IssueQuery.new(:name => 'Query', :visibility => IssueQuery::VISIBILITY_ROLES)
+                assert !query.save
+                assert_include "Roles can't be blank", query.errors.full_messages
+                query.role_ids = [1, 2]
+                assert query.save
+              end
+              def test_changing_roles_visibility_should_clear_roles
+                query = IssueQuery.create!(:name => 'Query', :visibility => IssueQuery::VISIBILITY_ROLES, :role_ids => [1, 2])
+                assert_equal 2, query.roles.count
+                query.visibility = IssueQuery::VISIBILITY_PUBLIC
+                query.save!
+                assert_equal 0, query.roles.count
+              end
               def test_available_filters_should_be_ordered
                 set_language_if_valid 'en'
                 query = IssueQuery.new
                 assert_equal 0, query.available_filters.keys.index('status_id')
                 expected_order = [
                   "Status",
                   "Project",
                   "Tracker",
                   "Priority"
                 ]
                 assert_equal expected_order,
                              (query.available_filters.values.map{|v| v[:name]} & expected_order)
               end
               def test_available_filters_with_custom_fields_should_be_ordered
                 set_language_if_valid 'en'
                 UserCustomField.create!(
                           :name => 'order test', :field_format => 'string',
                           :is_for_all => true, :is_filter => true
                         )
                 query = IssueQuery.new
                 expected_order = [
                   "Searchable field",
                   "Database",
                   "Project's Development status",
                   "Author's order test",
                   "Assignee's order test"
                 ]
                 assert_equal expected_order,
                              (query.available_filters.values.map{|v| v[:name]} & expected_order)
               end
               def test_custom_fields_for_all_projects_should_be_available_in_global_queries
                 query = IssueQuery.new(:project => nil, :name => '_')
                 assert query.available_filters.has_key?('cf_1')
                 assert !query.available_filters.has_key?('cf_3')
               end
               def test_system_shared_versions_should_be_available_in_global_queries
                 Version.find(2).update_attribute :sharing, 'system'
                 query = IssueQuery.new(:project => nil, :name => '_')
                 assert query.available_filters.has_key?('fixed_version_id')
                 assert query.available_filters['fixed_version_id'][:values].detect {|v| v.last == '2'}
               end
               def test_project_filter_in_global_queries
                 query = IssueQuery.new(:project => nil, :name => '_')
                 project_filter = query.available_filters["project_id"]
                 assert_not_nil project_filter
                 project_ids = project_filter[:values].map{|p| p[1]}
                 assert project_ids.include?("1")  #public project
                 assert !project_ids.include?("2") #private project user cannot see
               end
               def find_issues_with_query(query)
                 Issue.includes([:assigned_to, :status, :tracker, :project, :priority]).where(
                      query.statement
                    ).all
               end
               def assert_find_issues_with_query_is_successful(query)
                 assert_nothing_raised do
                   find_issues_with_query(query)
                 end
               end
               def assert_query_statement_includes(query, condition)
                 assert_include condition, query.statement
               end
               def assert_query_result(expected, query)
                 assert_nothing_raised do
                   assert_equal expected.map(&:id).sort, query.issues.map(&:id).sort
                   assert_equal expected.size, query.issue_count
                 end
               end
               def test_query_should_allow_shared_versions_for_a_project_query
                 subproject_version = Version.find(4)
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('fixed_version_id', '=', [subproject_version.id.to_s])
                 assert query.statement.include?("#{Issue.table_name}.fixed_version_id IN ('4')")
               end
               def test_query_with_multiple_custom_fields
                 query = IssueQuery.find(1)
                 assert query.valid?
                 assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.length
                 assert_equal Issue.find(3), issues.first
               end
               def test_operator_none
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('fixed_version_id', '!*', [''])
                 query.add_filter('cf_1', '!*', [''])
                 assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NULL")
                 assert query.statement.include?("#{CustomValue.table_name}.value IS NULL OR #{CustomValue.table_name}.value = ''")
                 find_issues_with_query(query)
               end
               def test_operator_none_for_integer
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('estimated_hours', '!*', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 assert issues.all? {|i| !i.estimated_hours}
               end
               def test_operator_none_for_date
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('start_date', '!*', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 assert issues.all? {|i| i.start_date.nil?}
               end
               def test_operator_none_for_string_custom_field
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('cf_2', '!*', [''])
                 assert query.has_filter?('cf_2')
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 assert issues.all? {|i| i.custom_field_value(2).blank?}
               end
               def test_operator_all
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('fixed_version_id', '*', [''])
                 query.add_filter('cf_1', '*', [''])
                 assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NOT NULL")
                 assert query.statement.include?("#{CustomValue.table_name}.value IS NOT NULL AND #{CustomValue.table_name}.value <> ''")
                 find_issues_with_query(query)
               end
               def test_operator_all_for_date
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('start_date', '*', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 assert issues.all? {|i| i.start_date.present?}
               end
               def test_operator_all_for_string_custom_field
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('cf_2', '*', [''])
                 assert query.has_filter?('cf_2')
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 assert issues.all? {|i| i.custom_field_value(2).present?}
               end
               def test_numeric_filter_should_not_accept_non_numeric_values
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('estimated_hours', '=', ['a'])
                 assert query.has_filter?('estimated_hours')
                 assert !query.valid?
               end
               def test_operator_is_on_float
                 Issue.update_all("estimated_hours = 171.2", "id=2")
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('estimated_hours', '=', ['171.20'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 assert_equal 2, issues.first.id
               end
               def test_operator_is_on_integer_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_for_all => true, :is_filter => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['12'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 assert_equal 2, issues.first.id
               end
               def test_operator_is_on_integer_custom_field_should_accept_negative_value
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_for_all => true, :is_filter => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '-12')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['-12'])
                 assert query.valid?
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 assert_equal 2, issues.first.id
               end
               def test_operator_is_on_float_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'float', :is_filter => true, :is_for_all => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7.3')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12.7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['12.7'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 assert_equal 2, issues.first.id
               end
               def test_operator_is_on_float_custom_field_should_accept_negative_value
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'float', :is_filter => true, :is_for_all => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7.3')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '-12.7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['-12.7'])
                 assert query.valid?
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 assert_equal 2, issues.first.id
               end
               def test_operator_is_on_multi_list_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
                   :possible_values => ['value1', 'value2', 'value3'], :multiple => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value1')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['value1'])
                 issues = find_issues_with_query(query)
                 assert_equal [1, 3], issues.map(&:id).sort
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '=', ['value2'])
                 issues = find_issues_with_query(query)
                 assert_equal [1], issues.map(&:id).sort
               end
               def test_operator_is_not_on_multi_list_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'list', :is_filter => true, :is_for_all => true,
                   :possible_values => ['value1', 'value2', 'value3'], :multiple => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value1')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => 'value2')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => 'value1')
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '!', ['value1'])
                 issues = find_issues_with_query(query)
                 assert !issues.map(&:id).include?(1)
                 assert !issues.map(&:id).include?(3)
                 query = IssueQuery.new(:name => '_')
                 query.add_filter("cf_#{f.id}", '!', ['value2'])
                 issues = find_issues_with_query(query)
                 assert !issues.map(&:id).include?(1)
                 assert issues.map(&:id).include?(3)
               end
               def test_operator_is_on_is_private_field
                 # is_private filter only available for those who can set issues private
                 User.current = User.find(2)
                 query = IssueQuery.new(:name => '_')
                 assert query.available_filters.key?('is_private')
                 query.add_filter("is_private", '=', ['1'])
                 issues = find_issues_with_query(query)
                 assert issues.any?
                 assert_nil issues.detect {|issue| !issue.is_private?}
               ensure
                 User.current = nil
               end
               def test_operator_is_not_on_is_private_field
                 # is_private filter only available for those who can set issues private
                 User.current = User.find(2)
                 query = IssueQuery.new(:name => '_')
                 assert query.available_filters.key?('is_private')
                 query.add_filter("is_private", '!', ['1'])
                 issues = find_issues_with_query(query)
                 assert issues.any?
                 assert_nil issues.detect {|issue| issue.is_private?}
               ensure
                 User.current = nil
               end
               def test_operator_greater_than
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('done_ratio', '>=', ['40'])
                 assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40.0")
                 find_issues_with_query(query)
               end
               def test_operator_greater_than_a_float
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('estimated_hours', '>=', ['40.5'])
                 assert query.statement.include?("#{Issue.table_name}.estimated_hours >= 40.5")
                 find_issues_with_query(query)
               end
               def test_operator_greater_than_on_int_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '7')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '12')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter("cf_#{f.id}", '>=', ['8'])
                 issues = find_issues_with_query(query)
                 assert_equal 1, issues.size
                 assert_equal 2, issues.first.id
               end
               def test_operator_lesser_than
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('done_ratio', '<=', ['30'])
                 assert query.statement.include?("#{Issue.table_name}.done_ratio <= 30.0")
                 find_issues_with_query(query)
               end
               def test_operator_lesser_than_on_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter("cf_#{f.id}", '<=', ['30'])
                 assert_match /CAST.+ <= 30\.0/, query.statement
                 find_issues_with_query(query)
               end
               def test_operator_lesser_than_on_date_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'date', :is_filter => true, :is_for_all => true)
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(1), :value => '2013-04-11')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(2), :value => '2013-05-14')
                 CustomValue.create!(:custom_field => f, :customized => Issue.find(3), :value => '')
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter("cf_#{f.id}", '<=', ['2013-05-01'])
                 issue_ids = find_issues_with_query(query).map(&:id)
                 assert_include 1, issue_ids
                 assert_not_include 2, issue_ids
                 assert_not_include 3, issue_ids
               end
               def test_operator_between
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('done_ratio', '><', ['30', '40'])
                 assert_include "#{Issue.table_name}.done_ratio BETWEEN 30.0 AND 40.0", query.statement
                 find_issues_with_query(query)
               end
               def test_operator_between_on_custom_field
                 f = IssueCustomField.create!(:name => 'filter', :field_format => 'int', :is_filter => true, :is_for_all => true)
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter("cf_#{f.id}", '><', ['30', '40'])
                 assert_match /CAST.+ BETWEEN 30.0 AND 40.0/, query.statement
                 find_issues_with_query(query)
               end
               def test_date_filter_should_not_accept_non_date_values
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('created_on', '=', ['a'])
                 assert query.has_filter?('created_on')
                 assert !query.valid?
               end
               def test_date_filter_should_not_accept_invalid_date_values
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('created_on', '=', ['2011-01-34'])
                 assert query.has_filter?('created_on')
                 assert !query.valid?
               end
               def test_relative_date_filter_should_not_accept_non_integer_values
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('created_on', '>t-', ['a'])
                 assert query.has_filter?('created_on')
                 assert !query.valid?
               end
               def test_operator_date_equals
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('due_date', '=', ['2011-07-10'])
                 assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                 find_issues_with_query(query)
               end
               def test_operator_date_lesser_than
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('due_date', '<=', ['2011-07-10'])
                 assert_match /issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                 find_issues_with_query(query)
               end
               def test_operator_date_greater_than
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('due_date', '>=', ['2011-07-10'])
                 assert_match /issues\.due_date > '2011-07-09 23:59:59(\.9+)?'/, query.statement
                 find_issues_with_query(query)
               end
               def test_operator_date_between
                 query = IssueQuery.new(:name => '_')
                 query.add_filter('due_date', '><', ['2011-06-23', '2011-07-10'])
                 assert_match /issues\.due_date > '2011-06-22 23:59:59(\.9+)?' AND issues\.due_date <= '2011-07-10 23:59:59(\.9+)?/, query.statement
                 find_issues_with_query(query)
               end
               def test_operator_in_more_than
                 Issue.find(7).update_attribute(:due_date, (Date.today + 15))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '>t+', ['15'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert(issue.due_date >= (Date.today + 15))}
               end
               def test_operator_in_less_than
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '<t+', ['15'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert(issue.due_date <= (Date.today + 15))}
               end
               def test_operator_in_the_next_days
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '><t+', ['15'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert(issue.due_date >= Date.today && issue.due_date <= (Date.today + 15))}
               end
               def test_operator_less_than_ago
                 Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '>t-', ['3'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert(issue.due_date >= (Date.today - 3))}
               end
               def test_operator_in_the_past_days
                 Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '><t-', ['3'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert(issue.due_date >= (Date.today - 3) && issue.due_date <= Date.today)}
               end
               def test_operator_more_than_ago
                 Issue.find(7).update_attribute(:due_date, (Date.today - 10))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', '<t-', ['10'])
                 assert query.statement.include?("#{Issue.table_name}.due_date <=")
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert(issue.due_date <= (Date.today - 10))}
               end
               def test_operator_in
                 Issue.find(7).update_attribute(:due_date, (Date.today + 2))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 't+', ['2'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert_equal((Date.today + 2), issue.due_date)}
               end
               def test_operator_ago
                 Issue.find(7).update_attribute(:due_date, (Date.today - 3))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 't-', ['3'])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert_equal((Date.today - 3), issue.due_date)}
               end
               def test_operator_today
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 't', [''])
                 issues = find_issues_with_query(query)
                 assert !issues.empty?
                 issues.each {|issue| assert_equal Date.today, issue.due_date}
               end
               def test_operator_this_week_on_date
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 'w', [''])
                 find_issues_with_query(query)
               end
               def test_operator_this_week_on_datetime
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('created_on', 'w', [''])
                 find_issues_with_query(query)
               end
               def test_operator_contains
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('subject', '~', ['uNable'])
                 assert query.statement.include?("LOWER(#{Issue.table_name}.subject) LIKE '%unable%'")
                 result = find_issues_with_query(query)
                 assert result.empty?
                 result.each {|issue| assert issue.subject.downcase.include?('unable') }
               end
               def test_range_for_this_week_with_week_starting_on_monday
                 I18n.locale = :fr
                 assert_equal '1', I18n.t(:general_first_day_of_week)
                 Date.stubs(:today).returns(Date.parse('2011-04-29'))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 'w', [''])
                 assert query.statement.match(/issues\.due_date > '2011-04-24 23:59:59(\.9+)?' AND issues\.due_date <= '2011-05-01 23:59:59(\.9+)?/), "range not found in #{query.statement}"
                 I18n.locale = :en
               end
               def test_range_for_this_week_with_week_starting_on_sunday
                 I18n.locale = :en
                 assert_equal '7', I18n.t(:general_first_day_of_week)
                 Date.stubs(:today).returns(Date.parse('2011-04-29'))
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('due_date', 'w', [''])
                 assert query.statement.match(/issues\.due_date > '2011-04-23 23:59:59(\.9+)?' AND issues\.due_date <= '2011-04-30 23:59:59(\.9+)?/), "range not found in #{query.statement}"
               end
               def test_operator_does_not_contains
                 query = IssueQuery.new(:project => Project.find(1), :name => '_')
                 query.add_filter('subject', '!~', ['uNable'])
                 assert query.statement.include?("LOWER(#{Issue.table_name}.subject) NOT LIKE '%unable%'")
                 find_issues_with_query(query)
               end
               def test_filter_assigned_to_me
                 user = User.find(2)
                 group = Group.find(10)
                 User.current = user
                 i1 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => user)
                 i2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => group)
                 i3 = Issue.generate!(:project_id => 1, :tracker_id => 1, :assigned_to => Group.find(11))
                 group.users << user
                 query = IssueQuery.new(:name => '_', :filters => { 'assigned_to_id' => {:operator => '=', :values => ['me']}})
                 result = query.issues
                 assert_equal Issue.visible.where(:assigned_to_id => ([2] + user.reload.group_ids)).sort_by(&:id), result.sort_by(&:id)
                 assert result.include?(i1)
                 assert result.include?(i2)
                 assert !result.include?(i3)
               end
               def test_user_custom_field_filtered_on_me
                 User.current = User.find(2)
                 cf = IssueCustomField.create!(:field_format => 'user', :is_for_all => true, :is_filter => true, :name => 'User custom field', :tracker_ids => [1])
                 issue1 = Issue.create!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '2'}, :subject => 'Test', :author_id => 1)
                 issue2 = Issue.generate!(:project_id => 1, :tracker_id => 1, :custom_field_values => {cf.id.to_s => '3'})
                 query = IssueQuery.new(:name => '_', :project => Project.find(1))
                 filter = query.available_filters["cf_#{cf.id}"]
                 assert_not_nil filter
                 assert_include 'me', filter[:values].map{|v| v[1]}
                 query.filters = { "cf_#{cf.id}" => {:operator => '=', :values => ['me']}}
                 result = query.issues
                 assert_equal 1, result.size
                 assert_equal issue1, result.first
               end
               def test_filter_my_projects
                 User.current = User.find(2)
                 query = IssueQuery.new(:name => '_')
                 filter = query.available_filters['project_id']
                 assert_not_nil filter
                 assert_include 'mine', filter[:values].map{|v| v[1]}
                 query.filters = { 'project_id' => {:operator => '=', :values => ['mine']}}
                 result = query.issues
                 assert_nil result.detect {|issue| !User.current.member_of?(issue.project)}
               end
               def test_filter_watched_issues
                 User.current = User.find(1)
                 query = IssueQuery.new(:name => '_', :filters => { 'watcher_id' => {:operator => '=', :values => ['me']}})
                 result = find_issues_with_query(query)
                 assert_not_nil result
                 assert !result.empty?
                 assert_equal Issue.visible.watched_by(User.current).sort_by(&:id), result.sort_by(&:id)
                 User.current = nil
               end
               def test_filter_unwatched_issues
                 User.current = User.find(1)
                 query = IssueQuery.new(:name => '_', :filters => { 'watcher_id' => {:operator => '!', :values => ['me']}})
                 result = find_issues_with_query(query)
                 assert_not_nil result
                 assert !result.empty?
                 assert_equal((Issue.visible - Issue.watched_by(User.current)).sort_by(&:id).size, result.sort_by(&:id).size)
                 User.current = nil
               end
               def test_filter_on_project_custom_field
                 field = ProjectCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => Project.find(3), :value => 'Foo')
                 CustomValue.create!(:custom_field => field, :customized => Project.find(5), :value => 'Foo')
                 query = IssueQuery.new(:name => '_')
                 filter_name = "project.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 assert_equal [3, 5], find_issues_with_query(query).map(&:project_id).uniq.sort
               end
               def test_filter_on_author_custom_field
                 field = UserCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => User.find(3), :value => 'Foo')
                 query = IssueQuery.new(:name => '_')
                 filter_name = "author.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 assert_equal [3], find_issues_with_query(query).map(&:author_id).uniq.sort
               end
               def test_filter_on_assigned_to_custom_field
                 field = UserCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => User.find(3), :value => 'Foo')
                 query = IssueQuery.new(:name => '_')
                 filter_name = "assigned_to.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 assert_equal [3], find_issues_with_query(query).map(&:assigned_to_id).uniq.sort
               end
               def test_filter_on_fixed_version_custom_field
                 field = VersionCustomField.create!(:name => 'Client', :is_filter => true, :field_format => 'string')
                 CustomValue.create!(:custom_field => field, :customized => Version.find(2), :value => 'Foo')
                 query = IssueQuery.new(:name => '_')
                 filter_name = "fixed_version.cf_#{field.id}"
                 assert_include filter_name, query.available_filters.keys
                 query.filters = {filter_name => {:operator => '=', :values => ['Foo']}}
                 assert_equal [2], find_issues_with_query(query).map(&:fixed_version_id).uniq.sort
               end
               def test_filter_on_relations_with_a_specific_issue
                 IssueRelation.delete_all
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=', :values => ['1']}}
                 assert_equal [2, 3], find_issues_with_query(query).map(&:id).sort
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=', :values => ['2']}}
                 assert_equal [1], find_issues_with_query(query).map(&:id).sort
               end
               def test_filter_on_relations_with_any_issues_in_a_project
                 IssueRelation.delete_all
                 with_settings :cross_project_issue_relations => '1' do
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(2).issues.first)
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(3).issues.first)
                 end
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=p', :values => ['2']}}
                 assert_equal [1, 2], find_issues_with_query(query).map(&:id).sort
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=p', :values => ['3']}}
                 assert_equal [1], find_issues_with_query(query).map(&:id).sort
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=p', :values => ['4']}}
                 assert_equal [], find_issues_with_query(query).map(&:id).sort
               end
               def test_filter_on_relations_with_any_issues_not_in_a_project
                 IssueRelation.delete_all
                 with_settings :cross_project_issue_relations => '1' do
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
                   #IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(1).issues.first)
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(3).issues.first)
                 end
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '=!p', :values => ['1']}}
                 assert_equal [1], find_issues_with_query(query).map(&:id).sort
               end
               def test_filter_on_relations_with_no_issues_in_a_project
                 IssueRelation.delete_all
                 with_settings :cross_project_issue_relations => '1' do
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Project.find(2).issues.first)
                   IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(2), :issue_to => Project.find(3).issues.first)
                   IssueRelation.create!(:relation_type => "relates", :issue_to => Project.find(2).issues.first, :issue_from => Issue.find(3))
                 end
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '!p', :values => ['2']}}
                 ids = find_issues_with_query(query).map(&:id).sort
                 assert_include 2, ids
                 assert_not_include 1, ids
                 assert_not_include 3, ids
               end
               def test_filter_on_relations_with_no_issues
                 IssueRelation.delete_all
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '!*', :values => ['']}}
                 ids = find_issues_with_query(query).map(&:id)
                 assert_equal [], ids & [1, 2, 3]
                 assert_include 4, ids
               end
               def test_filter_on_relations_with_any_issues
                 IssueRelation.delete_all
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(1), :issue_to => Issue.find(2))
                 IssueRelation.create!(:relation_type => "relates", :issue_from => Issue.find(3), :issue_to => Issue.find(1))
                 query = IssueQuery.new(:name => '_')
                 query.filters = {"relates" => {:operator => '*', :values => ['']}}
                 assert_equal [1, 2, 3], find_issues_with_query(query).map(&:id).sort
               end
               def test_statement_should_be_nil_with_no_filters
                 q = IssueQuery.new(:name => '_')
                 q.filters = {}
                 assert q.valid?
                 assert_nil q.statement
               end
               def test_default_columns
                 q = IssueQuery.new
                 assert q.columns.any?
                 assert q.inline_columns.any?
                 assert q.block_columns.empty?
               end
               def test_set_column_names
                 q = IssueQuery.new
                 q.column_names = ['tracker', :subject, '', 'unknonw_column']
                 assert_equal [:id, :tracker, :subject], q.columns.collect {|c| c.name}
               end
               def test_has_column_should_accept_a_column_name
                 q = IssueQuery.new
                 q.column_names = ['tracker', :subject]
                 assert q.has_column?(:tracker)
                 assert !q.has_column?(:category)
               end
               def test_has_column_should_accept_a_column
                 q = IssueQuery.new
                 q.column_names = ['tracker', :subject]
                 tracker_column = q.available_columns.detect {|c| c.name==:tracker}
                 assert_kind_of QueryColumn, tracker_column
                 category_column = q.available_columns.detect {|c| c.name==:category}
                 assert_kind_of QueryColumn, category_column
                 assert q.has_column?(tracker_column)
                 assert !q.has_column?(category_column)
               end
               def test_inline_and_block_columns
                 q = IssueQuery.new
                 q.column_names = ['subject', 'description', 'tracker']
                 assert_equal [:id, :subject, :tracker], q.inline_columns.map(&:name)
                 assert_equal [:description], q.block_columns.map(&:name)
               end
               def test_custom_field_columns_should_be_inline
                 q = IssueQuery.new
                 columns = q.available_columns.select {|column| column.is_a? QueryCustomFieldColumn}
                 assert columns.any?
                 assert_nil columns.detect {|column| !column.inline?}
               end
               def test_query_should_preload_spent_hours
                 q = IssueQuery.new(:name => '_', :column_names => [:subject, :spent_hours])
                 assert q.has_column?(:spent_hours)
                 issues = q.issues
                 assert_not_nil issues.first.instance_variable_get("@spent_hours")
               end
               def test_groupable_columns_should_include_custom_fields
                 q = IssueQuery.new
                 column = q.groupable_columns.detect {|c| c.name == :cf_1}
                 assert_not_nil column
                 assert_kind_of QueryCustomFieldColumn, column
               end
               def test_groupable_columns_should_not_include_multi_custom_fields
                 field = CustomField.find(1)
                 field.update_attribute :multiple, true
                 q = IssueQuery.new
                 column = q.groupable_columns.detect {|c| c.name == :cf_1}
                 assert_nil column
               end
               def test_groupable_columns_should_include_user_custom_fields
                 cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1], :field_format => 'user')
                 q = IssueQuery.new
                 assert q.groupable_columns.detect {|c| c.name == "cf_#{cf.id}".to_sym}
               end
               def test_groupable_columns_should_include_version_custom_fields
                 cf = IssueCustomField.create!(:name => 'User', :is_for_all => true, :tracker_ids => [1], :field_format => 'version')
                 q = IssueQuery.new
                 assert q.groupable_columns.detect {|c| c.name == "cf_#{cf.id}".to_sym}
               end
               def test_grouped_with_valid_column
                 q = IssueQuery.new(:group_by => 'status')
                 assert q.grouped?
                 assert_not_nil q.group_by_column
                 assert_equal :status, q.group_by_column.name
                 assert_not_nil q.group_by_statement
                 assert_equal 'status', q.group_by_statement
               end
               def test_grouped_with_invalid_column
                 q = IssueQuery.new(:group_by => 'foo')
                 assert !q.grouped?
                 assert_nil q.group_by_column
                 assert_nil q.group_by_statement
               end
               def test_sortable_columns_should_sort_assignees_according_to_user_format_setting
                 with_settings :user_format => 'lastname_coma_firstname' do
                   q = IssueQuery.new
                   assert q.sortable_columns.has_key?('assigned_to')
                   assert_equal %w(users.lastname users.firstname users.id), q.sortable_columns['assigned_to']
                 end
               end
               def test_sortable_columns_should_sort_authors_according_to_user_format_setting
                 with_settings :user_format => 'lastname_coma_firstname' do
                   q = IssueQuery.new
                   assert q.sortable_columns.has_key?('author')
                   assert_equal %w(authors.lastname authors.firstname authors.id), q.sortable_columns['author']
                 end
               end
               def test_sortable_columns_should_include_custom_field
                 q = IssueQuery.new
                 assert q.sortable_columns['cf_1']
               end
               def test_sortable_columns_should_not_include_multi_custom_field
                 field = CustomField.find(1)
                 field.update_attribute :multiple, true
                 q = IssueQuery.new
                 assert !q.sortable_columns['cf_1']
               end
               def test_default_sort
                 q = IssueQuery.new
                 assert_equal [], q.sort_criteria
               end
               def test_set_sort_criteria_with_hash
                 q = IssueQuery.new
                 q.sort_criteria = {'0' => ['priority', 'desc'], '2' => ['tracker']}
                 assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
               end
               def test_set_sort_criteria_with_array
                 q = IssueQuery.new
                 q.sort_criteria = [['priority', 'desc'], 'tracker']
                 assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
               end
               def test_create_query_with_sort
                 q = IssueQuery.new(:name => 'Sorted')
                 q.sort_criteria = [['priority', 'desc'], 'tracker']
                 assert q.save
                 q.reload
                 assert_equal [['priority', 'desc'], ['tracker', 'asc']], q.sort_criteria
               end
               def test_sort_by_string_custom_field_asc
                 q = IssueQuery.new
                 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                 assert c
                 assert c.sortable
                 issues = q.issues(:order => "#{c.sortable} ASC")
                 values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
                 assert !values.empty?
                 assert_equal values.sort, values
               end
               def test_sort_by_string_custom_field_desc
                 q = IssueQuery.new
                 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'string' }
                 assert c
                 assert c.sortable
                 issues = q.issues(:order => "#{c.sortable} DESC")
                 values = issues.collect {|i| i.custom_value_for(c.custom_field).to_s}
                 assert !values.empty?
                 assert_equal values.sort.reverse, values
               end
               def test_sort_by_float_custom_field_asc
                 q = IssueQuery.new
                 c = q.available_columns.find {|col| col.is_a?(QueryCustomFieldColumn) && col.custom_field.field_format == 'float' }
                 assert c
                 assert c.sortable
                 issues = q.issues(:order => "#{c.sortable} ASC")
                 values = issues.collect {|i| begin; Kernel.Float(i.custom_value_for(c.custom_field).to_s); rescue; nil; end}.compact
                 assert !values.empty?
                 assert_equal values.sort, values
               end
               def test_invalid_query_should_raise_query_statement_invalid_error
                 q = IssueQuery.new
                 assert_raise Query::StatementInvalid do
                   q.issues(:conditions => "foo = 1")
                 end
               end
               def test_issue_count
                 q = IssueQuery.new(:name => '_')
                 issue_count = q.issue_count
                 assert_equal q.issues.size, issue_count
               end
               def test_issue_count_with_archived_issues
                 p = Project.generate! do |project|
                   project.status = Project::STATUS_ARCHIVED
                 end
                 i = Issue.generate!( :project => p, :tracker => p.trackers.first )
                 assert !i.visible?
                 test_issue_count
               end
               def test_issue_count_by_association_group
                 q = IssueQuery.new(:name => '_', :group_by => 'assigned_to')
                 count_by_group = q.issue_count_by_group
                 assert_kind_of Hash, count_by_group
                 assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                 assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                 assert count_by_group.has_key?(User.find(3))
               end
               def test_issue_count_by_list_custom_field_group
                 q = IssueQuery.new(:name => '_', :group_by => 'cf_1')
                 count_by_group = q.issue_count_by_group
                 assert_kind_of Hash, count_by_group
                 assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                 assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
                 assert count_by_group.has_key?('MySQL')
               end
               def test_issue_count_by_date_custom_field_group
                 q = IssueQuery.new(:name => '_', :group_by => 'cf_8')
                 count_by_group = q.issue_count_by_group
                 assert_kind_of Hash, count_by_group
                 assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
                 assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
               end
               def test_issue_count_with_nil_group_only
                 Issue.update_all("assigned_to_id = NULL")
                 q = IssueQuery.new(:name => '_', :group_by => 'assigned_to')
                 count_by_group = q.issue_count_by_group
                 assert_kind_of Hash, count_by_group
                 assert_equal 1, count_by_group.keys.size
                 assert_nil count_by_group.keys.first
               end
               def test_issue_ids
                 q = IssueQuery.new(:name => '_')
                 order = "issues.subject, issues.id"
                 issues = q.issues(:order => order)
                 assert_equal issues.map(&:id), q.issue_ids(:order => order)
               end
               def test_label_for
                 set_language_if_valid 'en'
                 q = IssueQuery.new
                 assert_equal 'Assignee', q.label_for('assigned_to_id')
               end
               def test_label_for_fr
                 set_language_if_valid 'fr'
                 q = IssueQuery.new
                 s = "Assign\xc3\xa9 \xc3\xa0"
                 s.force_encoding('UTF-8') if s.respond_to?(:force_encoding)
                 assert_equal s, q.label_for('assigned_to_id')
               end
               def test_editable_by
                 admin = User.find(1)
                 manager = User.find(2)
                 developer = User.find(3)
                 # Public query on project 1
                 q = IssueQuery.find(1)
                 assert q.editable_by?(admin)
                 assert q.editable_by?(manager)
                 assert !q.editable_by?(developer)
                 # Private query on project 1
                 q = IssueQuery.find(2)
                 assert q.editable_by?(admin)
                 assert !q.editable_by?(manager)
                 assert q.editable_by?(developer)
                 # Private query for all projects
                 q = IssueQuery.find(3)
                 assert q.editable_by?(admin)
                 assert !q.editable_by?(manager)
                 assert q.editable_by?(developer)
                 # Public query for all projects
                 q = IssueQuery.find(4)
                 assert q.editable_by?(admin)
                 assert !q.editable_by?(manager)
                 assert !q.editable_by?(developer)
               end
               def test_visible_scope
                 query_ids = IssueQuery.visible(User.anonymous).map(&:id)
                 assert query_ids.include?(1), 'public query on public project was not visible'
                 assert query_ids.include?(4), 'public query for all projects was not visible'
                 assert !query_ids.include?(2), 'private query on public project was visible'
                 assert !query_ids.include?(3), 'private query for all projects was visible'
                 assert !query_ids.include?(7), 'public query on private project was visible'
               end
+              def test_query_with_public_visibility_should_be_visible_to_anyone
+                q = IssueQuery.create!(:name => 'Query', :visibility => IssueQuery::VISIBILITY_PUBLIC)
+                assert q.visible?(User.anonymous)
+                assert IssueQuery.visible(User.anonymous).find_by_id(q.id)
+                assert q.visible?(User.find(7))
+                assert IssueQuery.visible(User.find(7)).find_by_id(q.id)
+                assert q.visible?(User.find(2))
+                assert IssueQuery.visible(User.find(2)).find_by_id(q.id)
+                assert q.visible?(User.find(1))
+                assert IssueQuery.visible(User.find(1)).find_by_id(q.id)
+              end
+              def test_query_with_roles_visibility_should_be_visible_to_user_with_role
+                q = IssueQuery.create!(:name => 'Query', :visibility => IssueQuery::VISIBILITY_ROLES, :role_ids => [1,2])
+                assert !q.visible?(User.anonymous)
+                assert_nil IssueQuery.visible(User.anonymous).find_by_id(q.id)
+                assert !q.visible?(User.find(7))
+                assert_nil IssueQuery.visible(User.find(7)).find_by_id(q.id)
+                assert q.visible?(User.find(2))
+                assert IssueQuery.visible(User.find(2)).find_by_id(q.id)
+                assert q.visible?(User.find(1))
+                assert IssueQuery.visible(User.find(1)).find_by_id(q.id)
+              end
+              def test_query_with_private_visibility_should_be_visible_to_owner
+                q = IssueQuery.create!(:name => 'Query', :visibility => IssueQuery::VISIBILITY_PRIVATE, :user => User.find(7))
+                assert !q.visible?(User.anonymous)
+                assert_nil IssueQuery.visible(User.anonymous).find_by_id(q.id)
+                assert q.visible?(User.find(7))
+                assert IssueQuery.visible(User.find(7)).find_by_id(q.id)
+                assert !q.visible?(User.find(2))
+                assert_nil IssueQuery.visible(User.find(2)).find_by_id(q.id)
+                assert q.visible?(User.find(1))
+                assert_nil IssueQuery.visible(User.find(1)).find_by_id(q.id)
+              end
               test "#available_filters should include users of visible projects in cross-project view" do
                 users = IssueQuery.new.available_filters["assigned_to_id"]
                 assert_not_nil users
                 assert users[:values].map{|u|u[1]}.include?("3")
               end
               test "#available_filters should include users of subprojects" do
                 user1 = User.generate!
                 user2 = User.generate!
                 project = Project.find(1)
                 Member.create!(:principal => user1, :project => project.children.visible.first, :role_ids => [1])
                 users = IssueQuery.new(:project => project).available_filters["assigned_to_id"]
                 assert_not_nil users
                 assert users[:values].map{|u|u[1]}.include?(user1.id.to_s)
                 assert !users[:values].map{|u|u[1]}.include?(user2.id.to_s)
               end
               test "#available_filters should include visible projects in cross-project view" do
                 projects = IssueQuery.new.available_filters["project_id"]
                 assert_not_nil projects
                 assert projects[:values].map{|u|u[1]}.include?("1")
               end
               test "#available_filters should include 'member_of_group' filter" do
                 query = IssueQuery.new
                 assert query.available_filters.keys.include?("member_of_group")
                 assert_equal :list_optional, query.available_filters["member_of_group"][:type]
                 assert query.available_filters["member_of_group"][:values].present?
                 assert_equal Group.all.sort.map {|g| [g.name, g.id.to_s]},
                   query.available_filters["member_of_group"][:values].sort
               end
               test "#available_filters should include 'assigned_to_role' filter" do
                 query = IssueQuery.new
                 assert query.available_filters.keys.include?("assigned_to_role")
                 assert_equal :list_optional, query.available_filters["assigned_to_role"][:type]
                 assert query.available_filters["assigned_to_role"][:values].include?(['Manager','1'])
                 assert query.available_filters["assigned_to_role"][:values].include?(['Developer','2'])
                 assert query.available_filters["assigned_to_role"][:values].include?(['Reporter','3'])
                 assert ! query.available_filters["assigned_to_role"][:values].include?(['Non member','4'])
                 assert ! query.available_filters["assigned_to_role"][:values].include?(['Anonymous','5'])
               end
               context "#statement" do
                 context "with 'member_of_group' filter" do
                   setup do
                     Group.destroy_all # No fixtures
                     @user_in_group = User.generate!
                     @second_user_in_group = User.generate!
                     @user_in_group2 = User.generate!
                     @user_not_in_group = User.generate!
                     @group = Group.generate!.reload
                     @group.users << @user_in_group
                     @group.users << @second_user_in_group
                     @group2 = Group.generate!.reload
                     @group2.users << @user_in_group2
                   end
                   should "search assigned to for users in the group" do
                     @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '=', [@group.id.to_s])
                     assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@group.id}')"
                     assert_find_issues_with_query_is_successful @query
                   end
                   should "search not assigned to any group member (none)" do
                     @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '!*', [''])
                     # Users not in a group
                     assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IS NULL OR #{Issue.table_name}.assigned_to_id NOT IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}','#{@group.id}','#{@group2.id}')"
                     assert_find_issues_with_query_is_successful @query
                   end
                   should "search assigned to any group member (all)" do
                     @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '*', [''])
                     # Only users in a group
                     assert_query_statement_includes @query, "#{Issue.table_name}.assigned_to_id IN ('#{@user_in_group.id}','#{@second_user_in_group.id}','#{@user_in_group2.id}','#{@group.id}','#{@group2.id}')"
                     assert_find_issues_with_query_is_successful @query
                   end
                   should "return an empty set with = empty group" do
                     @empty_group = Group.generate!
                     @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '=', [@empty_group.id.to_s])
                     assert_equal [], find_issues_with_query(@query)
                   end
                   should "return issues with ! empty group" do
                     @empty_group = Group.generate!
                     @query = IssueQuery.new(:name => '_')
                     @query.add_filter('member_of_group', '!', [@empty_group.id.to_s])
                     assert_find_issues_with_query_is_successful @query
                   end
                 end
                 context "with 'assigned_to_role' filter" do
                   setup do
                     @manager_role = Role.find_by_name('Manager')
                     @developer_role = Role.find_by_name('Developer')
                     @project = Project.generate!
                     @manager = User.generate!
                     @developer = User.generate!
                     @boss = User.generate!
                     @guest = User.generate!
                     User.add_to_project(@manager, @project, @manager_role)
                     User.add_to_project(@developer, @project, @developer_role)
                     User.add_to_project(@boss, @project, [@manager_role, @developer_role])
                     @issue1 = Issue.generate!(:project => @project, :assigned_to_id => @manager.id)
                     @issue2 = Issue.generate!(:project => @project, :assigned_to_id => @developer.id)
                     @issue3 = Issue.generate!(:project => @project, :assigned_to_id => @boss.id)
                     @issue4 = Issue.generate!(:project => @project, :assigned_to_id => @guest.id)
                     @issue5 = Issue.generate!(:project => @project)
                   end
                   should "search assigned to for users with the Role" do
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                     assert_query_result [@issue1, @issue3], @query
                   end
                   should "search assigned to for users with the Role on the issue project" do
                     other_project = Project.generate!
                     User.add_to_project(@developer, other_project, @manager_role)
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '=', [@manager_role.id.to_s])
                     assert_query_result [@issue1, @issue3], @query
                   end
                   should "return an empty set with empty role" do
                     @empty_role = Role.generate!
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '=', [@empty_role.id.to_s])
                     assert_query_result [], @query
                   end
                   should "search assigned to for users without the Role" do
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '!', [@manager_role.id.to_s])
                     assert_query_result [@issue2, @issue4, @issue5], @query
                   end
                   should "search assigned to for users not assigned to any Role (none)" do
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '!*', [''])
                     assert_query_result [@issue4, @issue5], @query
                   end
                   should "search assigned to for users assigned to any Role (all)" do
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '*', [''])
                     assert_query_result [@issue1, @issue2, @issue3], @query
                   end
                   should "return issues with ! empty role" do
                     @empty_role = Role.generate!
                     @query = IssueQuery.new(:name => '_', :project => @project)
                     @query.add_filter('assigned_to_role', '!', [@empty_role.id.to_s])
                     assert_query_result [@issue1, @issue2, @issue3, @issue4, @issue5], @query
                   end
                 end
               end
             end

test/unit/user_test.rb 0 0

	1	NO CONTENT: modified file			NO CONTENT: modified file
The requested commit or file is too big and content was truncated. Show full diff

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