Skip to content

O
OHR Support
Commit df0a49ff authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

"me" value is now available in queries for "assigned to" and "author" filters. 

When executing the query, it is replaced by the currently logged in user.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@520 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent 50429d08
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 4 deletions
app/controllers/feeds_controller.rb
View file @ df0a49ff
......@@ -37,6 +37,7 @@ class FeedsController < ApplicationController
def issues
if @project && params[:query_id]
query = Query.find(params[:query_id])
query.executed_by = @user
# ignore query if it's not valid
query = nil unless query.valid?
# override with query conditions
......@@ -56,6 +57,7 @@ class FeedsController < ApplicationController
def history
if @project && params[:query_id]
query = Query.find(params[:query_id])
query.executed_by = @user
# ignore query if it's not valid
query = nil unless query.valid?
# override with query conditions
......
app/controllers/projects_controller.rb
View file @ df0a49ff
......@@ -647,11 +647,12 @@ private
def retrieve_query
if params[:query_id]
@query = @project.queries.find(params[:query_id])
@query.executed_by = logged_in_user
session[:query] = @query
else
if params[:set_filter] or !session[:query] or session[:query].project_id != @project.id
# Give it a name, required to be valid
@query = Query.new(:name => "_")
@query = Query.new(:name => "_", :executed_by => logged_in_user)
@query.project = @project
if params[:fields] and params[:fields].is_a? Array
params[:fields].each do |field|
......
app/controllers/queries_controller.rb
View file @ df0a49ff
......@@ -42,6 +42,7 @@ class QueriesController < ApplicationController
private
def find_query
@query = Query.find(params[:id])
@query.executed_by = logged_in_user
@project = @query.project
# check if user is allowed to manage queries (same permission as add_query)
authorize('projects', 'add_query')
......
app/models/query.rb
View file @ df0a49ff
......@@ -21,6 +21,7 @@ class Query < ActiveRecord::Base
serialize :filters
attr_protected :project, :user
attr_accessor :executed_by
validates_presence_of :name, :on => :save
......@@ -59,6 +60,11 @@ class Query < ActiveRecord::Base
self.is_public = true
end
def executed_by=(user)
@executed_by = user
set_language_if_valid(user.language) if user
end
def validate
filters.each_key do |field|
errors.add label_for(field), :activerecord_error_blank unless
......@@ -81,8 +87,12 @@ class Query < ActiveRecord::Base
"due_date" => { :type => :date, :order => 12 } }
unless project.nil?
# project specific filters
@available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }
@available_filters["author_id"] = { :type => :list, :order => 5, :values => @project.users.collect{|s| [s.name, s.id.to_s] } }
user_values = []
user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
user_values += @project.users.collect{|s| [s.name, s.id.to_s] }
@available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values }
@available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values }
@available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
@available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.collect{|s| [s.name, s.id.to_s] } }
unless @project.children.empty?
......@@ -162,7 +172,7 @@ class Query < ActiveRecord::Base
end
filters.each_key do |field|
next if field == "subproject_id"
v = values_for field
v = values_for(field).clone
next unless v and !v.empty?
sql = sql + " AND " unless sql.empty?
......@@ -179,6 +189,11 @@ class Query < ActiveRecord::Base
db_field = field
end
# "me" value subsitution
if %w(assigned_to_id author_id).include?(field)
v.push(executed_by ? executed_by.id.to_s : "0") if v.delete("me")
end
case operator_for field
when "="
sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
......
lang/bg.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ 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
button_login: Вход
button_submit: Изпращане
......
lang/de.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ 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
button_login: Einloggen
button_submit: OK
......
lang/en.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ 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
button_login: Login
button_submit: Submit
......
lang/es.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ 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
button_login: Conexión
button_submit: Someter
......
lang/fr.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ label_start_to_end: début à fin
label_stay_logged_in: Rester connecté
label_disabled: désactivé
label_show_completed_versions: Voire les versions passées
label_me: moi
button_login: Connexion
button_submit: Soumettre
......
lang/it.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ 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
button_login: Login
button_submit: Invia
......
lang/ja.yml
View file @ df0a49ff
......@@ -385,6 +385,7 @@ 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
button_login: ログイン
button_submit: 変更
......
lang/pt-br.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ 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
button_login: Login
button_submit: Enviar
......
lang/pt.yml
View file @ df0a49ff
......@@ -384,6 +384,7 @@ label_start_to_end: inícia ao fim
label_stay_logged_in: Rester connecté
label_disabled: désactivé
label_show_completed_versions: Voire les versions passées
label_me: me
button_login: Login
button_submit: Enviar
......
lang/zh.yml
View file @ df0a49ff
......@@ -387,6 +387,7 @@ 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
button_login: 登录
button_submit: 提交
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment