summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgitlabhq <m@gitlabhq.com>2011-10-21 14:25:42 +0300
committergitlabhq <m@gitlabhq.com>2011-10-22 14:08:03 +0300
commitd49645a01348e093b87586b3575e93233d497aea (patch)
tree6614e64a4af9cb7ca8e354c7e2b14ef9ab8d3442
parent24f04c0a6154c6d5890642fb8a8ec16b44146547 (diff)
downloadgitlab-ce-d49645a01348e093b87586b3575e93233d497aea.tar.gz
fixed wall --all option
-rw-r--r--app/controllers/projects_controller.rb17
1 files changed, 8 insertions, 9 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5ccfe4bb342..54d19af7511 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -83,16 +83,15 @@ class ProjectsController < ApplicationController
#
def wall
- @date = case params[:view]
- when "week" then Date.today - 7.days
- when "all" then nil
- when "day" then Date.today
- else nil
- end
-
- @notes = @project.common_notes.order("created_at DESC")
- @notes = @date ? @notes.since(@date.at_beginning_of_day) : @notes.fresh.limit(10)
@note = Note.new
+ @notes = @project.common_notes.order("created_at DESC")
+
+ @notes = case params[:view]
+ when "week" then @notes.since((Date.today - 7.days).at_beginning_of_day)
+ when "all" then @notes.all
+ when "day" then @notes.since(Date.today.at_beginning_of_day)
+ else @notes.fresh.limit(10)
+ end
end
#