diff options
| author | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-06-12 11:31:38 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com> | 2012-06-12 11:31:38 +0300 |
| commit | 0e33bf6eb0883259af4b258532b948e5798e7d1d (patch) | |
| tree | 1deccc68e821a0f8ced37ebe67aa376f5f49b81f /app/controllers/issues_controller.rb | |
| parent | 3a2d7a6604372ce1ab98982709c9d851376879da (diff) | |
| download | gitlab-ce-0e33bf6eb0883259af4b258532b948e5798e7d1d.tar.gz | |
Refactored IssuesController
Diffstat (limited to 'app/controllers/issues_controller.rb')
| -rw-r--r-- | app/controllers/issues_controller.rb | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 64be20ff503..0e31f04deb5 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -23,16 +23,9 @@ class IssuesController < ApplicationController respond_to :js, :html def index - @issues = case params[:f].to_i - when 1 then @project.issues - when 2 then @project.issues.closed - when 3 then @project.issues.opened.assigned(current_user) - else @project.issues.opened - end + @issues = issues_filtered - @issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present? @issues = @issues.page(params[:page]).per(20) - @issues = @issues.includes(:author, :project).order("critical, updated_at") respond_to do |format| format.html # index.html.erb @@ -111,15 +104,9 @@ class IssuesController < ApplicationController def search terms = params['terms'] - @project = Project.find(params['project']) - @issues = case params[:status].to_i - when 1 then @project.issues - when 2 then @project.issues.closed - when 3 then @project.issues.opened.assigned(current_user) - else @project.issues.opened - end.page(params[:page]).per(100) - + @issues = issues_filtered @issues = @issues.where("title LIKE ?", "%#{terms}%") unless terms.blank? + @issues = @issues.page(params[:page]).per(100) render :partial => 'issues' end @@ -141,4 +128,17 @@ class IssuesController < ApplicationController def module_enabled return render_404 unless @project.issues_enabled end + + def issues_filtered + @issues = case params[:f].to_i + when 1 then @project.issues + when 2 then @project.issues.closed + when 3 then @project.issues.opened.assigned(current_user) + else @project.issues.opened + end + + @issues = @issues.where(:milestone_id => params[:milestone_id]) if params[:milestone_id].present? + @issues = @issues.includes(:author, :project).order("critical, updated_at") + @issues + end end |