merge to 2.1

Gemfile

@@ -1,3 +0,0 @@
-group :test do
-  gem 'webrat'
-end

app/controllers/questions_controller.rb → app/controllers/issuequestions_controller.rb

@@ -1,4 +1,4 @@
-class QuestionsController < ApplicationController
+class IssuequestionsController < ApplicationController
   unloadable
   layout 'base'
 
@@ -12,18 +12,31 @@ def user_issue_filter
     new_filter_for_questions_assigned_to(params[:user_id])
     redirect_to :controller => 'issues', :action => 'index', :project_id => params[:project]
   end
+
+  def hide
+    @question = Question.find(params[:id])
+    @question.hidden = true
+    if @question.save
+      redirect_to :back
+    end
+
+  end
 
   def autocomplete_for_user_login
-    if params[:user]
-      @users = User.active.all(:conditions => ["LOWER(login) LIKE :user OR LOWER(firstname) LIKE :user OR LOWER(lastname) LIKE :user", {:user => params[:user]+"%" }],
-                               :limit => 10,
-                               :order => 'login ASC')
+    if params[:issue_id] && Setting.plugin_question_plugin[:only_members] == 1
+      @issue = Issue.find(params[:issue_id])
+      base = @issue.project.users
+    else
+      base = User
+    end
+    q = (params[:q] || params[:term] || params[:user]).to_s.strip.downcase
+    if q.present?
+      @users = base.active.where(["LOWER(login) LIKE :user OR LOWER(firstname) LIKE :user OR LOWER(lastname) LIKE :user", {:user => q + "%" }]).
+                           limit(10).
+                           order('login ASC')
     end
     @users ||=[]
 
-    if params[:issue_id]
-      @issue = Issue.find_by_id(params[:issue_id])
-    end
     render :layout => false
   end
 
@@ -32,7 +45,7 @@ def autocomplete_for_user_login
   def new_filter_for_questions_assigned_to(user_id)
     @project = Project.find(params[:project]) unless params[:project].nil?
 
-    @query = Query.new(:name => "_",
+    @query = (ActiveSupport::Dependencies::search_for_file('issue_query') ? IssueQuery : Query).new(:name => "_",
                        :filters => {'status_id' => {:operator => '*', :values => [""]}}
                        )
     @query.project = @project unless params[:project].nil?

app/models/question.rb

@@ -5,18 +5,22 @@ class Question < ActiveRecord::Base
   belongs_to :assigned_to, :class_name => "User", :foreign_key => "assigned_to_id"
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   belongs_to :issue
-  belongs_to :journal
+  belongs_to :journal, :class_name => "Journal", :foreign_key => "journal_id"
 
   validates_presence_of :author
   validates_presence_of :issue
   validates_presence_of :journal
+
+  attr_protected :journal
+
+  scope :opened, lambda { where(:opened => true) }
+  scope :not_hidden, lambda { where(:hidden => false) }
 
-  named_scope :opened, :conditions => {:opened => true}
-  named_scope :for_user, lambda {|user|
-    { :conditions => {:assigned_to_id => user.id }}
+  scope :for_user, lambda {|user|
+     where(:assigned_to_id => user.id)
   }
-  named_scope :by_user, lambda {|user|
-    { :conditions => {:author_id => user.id }}
+  scope :by_user, lambda {|user|
+     where(:author_id => user.id)
   }
 
   delegate :notes, :to => :journal, :allow_nil => true
@@ -29,22 +33,20 @@ def close!(closing_journal=nil)
     if self.opened
       self.opened = false
       if self.save && closing_journal
-        QuestionMailer.deliver_answered_question(self, closing_journal)
+        QuestionMailer.answered_question(self, closing_journal).deliver
       end
     end
   end
-
+  
   # TODO: refactor to named_scope
   def self.count_of_open_for_user(user)
-    Question.count(:conditions => {:assigned_to_id => user.id, :opened => true})
+    Question.where(:assigned_to_id => user.id, :opened => true).count
   end
 
   # TODO: refactor to named_scope
   def self.count_of_open_for_user_on_project(user, project)
-    Question.count(:conditions => ["#{Question.table_name}.assigned_to_id = ? AND #{Project.table_name}.id = ? AND #{Question.table_name}.opened = ?",
-                                   user.id,
-                                   project.id,
-                                   true],
-                   :include => [:issue => [:project]])
+    Question.where(["(#{Question.table_name}.assigned_to_id = ?) AND #{project.project_condition(Setting.display_subprojects_issues?)} AND (#{Question.table_name}.opened = ?)",
+                    user.id, true]).
+             joins(:issue => :project).preload(:project).count
   end
 end

app/models/question_mailer.rb

@@ -1,69 +1,90 @@
+# encoding: utf-8
 class QuestionMailer < Mailer
   unloadable
 
   def asked_question(journal)
     question = journal.question
-    subject "[Question #{question.issue.project.name} ##{question.issue.id}] #{question.issue.subject}"
-    recipients question.assigned_to.mail unless question.assigned_to.nil?
-    @from  = "#{question.author.name} (Redmine) <#{Setting.mail_from}>" unless question.author.nil?
+
+    if Setting.plugin_question_plugin[:obfuscate_author] == "1"
+      # Obfuscate author infos
+      from = "#{Setting.app_title} <#{Setting.mail_from}>"
+    else
+      # Clear author infos
+      from = question.author ? "#{question.author.name} (#{l(:field_system_name)} - #{I18n.t(:text_question)}) <#{Setting.mail_from}>" : nil
+    end
+    to = question.assigned_to ? question.assigned_to.mail : nil
+    subject = "[#{question.issue.project.name} ##{question.issue.id}] #{question.issue.subject}"
+
+    @from = from
+    @question = question
+    @issue = question.issue
+    @journal = journal
+    @users = [question.assigned_to]
+    @issue_url = url_for(:controller => 'issues', :action => 'show', :id => question.issue)
+    @users = [question.assigned_to] 
+
     redmine_headers 'Issue-Id' => question.issue.id
     redmine_headers 'Question-Asked' => question.author.login if question.author.present?
     redmine_headers 'Question-Assigned-To' => question.assigned_to.login if question.assigned_to.present?
 
-    body({
-      :question => question,
-      :issue => question.issue,
-      :journal => journal,
-      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => question.issue)
-    })
-
-    RAILS_DEFAULT_LOGGER.debug 'Sending QuestionMailer#asked_question'
-    render_multipart('asked_question', body)
+    Rails.logger.debug 'Sending QuestionMailer#asked_question'
+    mail(:from => from, :to => to, :subject => subject)
   end
 
   def answered_question(question, closing_journal)
-    subject "[Answered #{question.issue.project.name} ##{question.issue.id}] #{question.issue.subject}"
+    if Setting.plugin_question_plugin[:obfuscate_author] == "1"
+      # Obfuscate author infos
+      from = "#{Setting.app_title} <#{Setting.mail_from}>"
+      @from = from
+    else
+      # Clear author infos
+      from = question.assigned_to ? "#{question.assigned_to.name} (#{l(:field_system_name)} - #{I18n.t(:text_answer)}) <#{Setting.mail_from}>" : nil
+      @from = "#{question.assigned_to.name} (#{l(:field_system_name)} - #{I18n.t(:text_answer)}) <#{Setting.mail_from}>" unless question.assigned_to.nil?
+    end
+    to = question.author ? question.author.mail : nil
+    subject =  "[#{question.issue.project.name} ##{question.issue.id}] #{question.issue.subject}"
+
+    @question = question
+    @issue = question.issue
+    @journal = closing_journal
+    @users = [question.author]
+    @issue_url = url_for(:controller => 'issues', :action => 'show', :id => question.issue)
+    @users = [question.author]
 
-    recipients question.author.mail unless question.author.nil?
-    @from = "#{question.assigned_to.name} (Redmine) <#{Setting.mail_from}>" unless question.assigned_to.nil?
     redmine_headers 'Issue-Id' => question.issue.id
     redmine_headers 'Question-Answer' => "#{question.issue.id}-#{closing_journal.id}"
 
-    body({
-      :question => question,
-      :issue => question.issue,
-      :journal => closing_journal,
-      :issue_url => url_for(:controller => 'issues', :action => 'show', :id => question.issue)
-    })
-
-    RAILS_DEFAULT_LOGGER.debug 'Sending QuestionMailer#answered_question'
-    render_multipart('answered_question', body)
+    Rails.logger.debug 'Sending QuestionMailer#answered_question'
+    mail(:from => from, :to => to, :subject => subject)
   end
 
   # Creates an email with a list of issues that have open questions
   # assigned to the user
   def question_reminder(user, issues)
-    redmine_headers 'Type' => "Question"
     set_language_if_valid user.language
-    recipients user.mail
-    subject l(:question_reminder_subject, :count => issues.size)
-    body :issues => issues,
-         :issues_url => url_for(:controller => 'questions', :action => 'my_issue_filter')
-    render_multipart('question_reminder', body)
+
+    to = user.mail
+    subject = l(:question_reminder_subject, :count => issues.size)
+
+    @issues = issues
+    @issues_url = url_for(:controller => 'issuequestions', :action => 'my_issue_filter')
+
+    redmine_headers 'Type' => 'Question'
+
+    mail(:to => to, :subject => subject)
   end
 
   # Send email reminders to users who have open questions.
   def self.question_reminders
-
-    open_questions_by_assignee = Question.opened.all(:order => 'id desc').group_by(&:assigned_to)
+    open_questions_by_assignee = Question.opened.order('id desc').all.group_by(&:assigned_to)
 
     open_questions_by_assignee.each do |assignee, questions|
-      next unless assignee.present?
+      next unless assignee.present? and not assignee.locked?
 
-      issues = questions.collect {|q| q.issue.visible?(assignee) ? q.issue : nil }.compact.uniq
+      issues = questions.reject {|q| not q.issue.visible?(assignee) }.collect {|q| q.issue }.uniq
       next if issues.count == 0
 
-      deliver_question_reminder(assignee, issues)
+      question_reminder(assignee, issues).deliver
     end
   end
 end

app/views/issuequestions/autocomplete_for_user_login.html.erb

@@ -0,0 +1,7 @@
+<%= raw @users.map {|user| {
+        'id' => user.login,
+        'label' => "#{user.login}: #{user.name(:lastname_coma_firstname)}",
+        'value' => user.login
+        }
+    }.to_json
+%>

app/views/issuequestions/autocomplete_for_user_login.json.erb

@@ -0,0 +1,7 @@
+<%= raw @users.map {|user| {
+      'id' => user.login,
+      'label' => "#{user.login}: #{user.name(:lastname_coma_firstname)}",
+      'value' => user.login
+      }
+    }.to_json
+%>

app/views/layouts/_questions.html.erb

@@ -0,0 +1,18 @@
+<% questions = Question.opened.not_hidden.for_user(User.current) %>
+<% if questions && questions.any? %>
+<div class="flash question">
+  <h3><%= l(:text_questions_for_me)%> (<%= h(questions.length) %>)</h3>
+  <ol>
+    <% questions.each do |question| %>
+    <li>
+      <%= link_to_issue(question.issue, :project => true, :subject => false) %>: 
+      <%= truncate(question.notes, :length => 120) %> 
+      <%= link_to l(:label_question_plugin_hide), hide_path(question) %>
+    </li>
+    <% end %>
+  </ol>
+</div>
+<% end %>
+
+
+

app/views/question_mailer/answered_question.html.erb

@@ -0,0 +1,20 @@
+<% if Setting.plugin_question_plugin[:obfuscate_content] == "1" %>
+<%= textilizable(l(:mail_body_answer_link)) %>
+<% else %>
+<h1><%= l(:text_answer) %></h1>
+<%= textilizable(@journal, :notes, :only_path => false) %>
+<% end %>
+
+<h1><%= l(:text_question_for) %> <%= @question.assigned_to %></h1>
+<%= textilizable(@question.journal, :notes, :only_path => false) %>
+
+<% if Setting.plugin_question_plugin[:obfuscate_content] == "0" %>
+<ul>
+<% for detail in @journal.details %>
+    <li><%= show_detail(detail, true) %></li>
+<% end %>
+</ul>
+
+<hr />
+<% end %>
+<%= render :partial => "mailer/issue", :locals => { :issue => @issue, :issue_url => @issue_url, :users => @users } %>

app/views/question_mailer/answered_question.text.erb

@@ -0,0 +1,20 @@
+<% if Setting.plugin_question_plugin[:obfuscate_content] == "1" %>
+<%= l(:mail_body_answer_link) %>
+<% else %>
+<h1><%= l(:text_answer) %></h1>
+<%= textilizable(@journal, :notes, :only_path => false) %>
+<% end %>
+
+<h1><%= l(:text_question_for) %> <%= @question.assigned_to %></h1>
+<%= textilizable(@question.journal, :notes, :only_path => false) %>
+
+<% if Setting.plugin_question_plugin[:obfuscate_content] == "0" %>
+<ul>
+<% for detail in @journal.details %>
+    <li><%= show_detail(detail, true) %></li>
+<% end %>
+</ul>
+
+<hr />
+<% end %>
+<%= render :partial => "mailer/issue", :locals => { :issue => @issue, :issue_url => @issue_url, :users => @users } %>

app/views/question_mailer/asked_question.html.erb

@@ -0,0 +1,16 @@
+<h1><%= l(:mail_body_title, name: @question.assigned_to, issue: "##{@issue.id}", author: @question.author) %></h1>
+
+<% if Setting.plugin_question_plugin[:obfuscate_content] == "1" %>
+<%= textilizable(l(:mail_body_question_link)) %>
+<% else %>
+<%= textilizable(@journal, :notes, :only_path => false) %>
+
+<ul>
+<% for detail in @journal.details %>
+    <li><%= show_detail(detail, true) %></li>
+<% end %>
+</ul>
+
+<hr />
+<% end %>
+<%= render :partial => "mailer/issue", :locals => { :issue => @issue, :issue_url => @issue_url, :users => @users } %>

app/views/question_mailer/asked_question.text.erb

@@ -0,0 +1,14 @@
+<%= l(:mail_body_title, name: @question.assigned_to, issue: "##{@issue.id}", author: @question.author) %>
+
+<% if Setting.plugin_question_plugin[:obfuscate_content] == "1" %>
+<%= l(:mail_body_question_link) %>
+<% else %>
+<%= @journal.notes if @journal.notes? %>
+
+<% for detail in @journal.details -%>
+<%= show_detail(detail, true) %>
+<% end -%>
+
+----------------------------------------
+<% end %>
+<%= render :partial => "mailer/issue", :locals => { :issue => @issue, :issue_url => @issue_url, :users => @users } %>