project -> show refactor
This commit is contained in:
parent
8786aff25a
commit
2f790001a0
3 changed files with 4 additions and 17 deletions
|
@ -64,21 +64,8 @@ class ProjectsController < ApplicationController
|
|||
|
||||
def show
|
||||
return render "projects/empty" unless @project.repo_exists?
|
||||
@date = case params[:view]
|
||||
when "week" then Date.today - 7.days
|
||||
when "day" then Date.today
|
||||
else nil
|
||||
end
|
||||
|
||||
if @date
|
||||
@date = @date.at_beginning_of_day
|
||||
|
||||
@commits = @project.commits_since(@date)
|
||||
@messages = project.notes.since(@date).order("created_at DESC")
|
||||
else
|
||||
@commits = @project.fresh_commits
|
||||
@messages = project.notes.fresh.limit(10)
|
||||
end
|
||||
limit = (params[:limit] || 40).to_i
|
||||
@activities = @project.updates(limit)
|
||||
end
|
||||
|
||||
#
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
= image_tag gravatar_icon(update.author_email), :class => "left", :width => 40
|
||||
%span.update-title
|
||||
- if update.kind_of?(Grit::Commit)
|
||||
%span.tag.commit= update.head.name
|
||||
%span.right.tag.commit= update.head.name
|
||||
= dashboard_feed_title(update)
|
||||
%span.update-author
|
||||
%strong= update.author_name
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
%span>
|
||||
Activities
|
||||
.project-box.project-updates.ui-box.ui-box-small.ui-box-big
|
||||
- @project.updates(20).each do |update|
|
||||
- @activities.each do |update|
|
||||
= render "projects/feed", :update => update, :project => @project
|
||||
|
||||
:javascript
|
||||
|
|
Loading…
Reference in a new issue