Merged activities & projects pages
This commit is contained in:
parent
724ea16c34
commit
cadf12c60c
9 changed files with 11 additions and 65 deletions
|
@ -13,6 +13,7 @@ class ProjectsController < ApplicationController
|
|||
def index
|
||||
@projects = current_user.projects
|
||||
@projects = @projects.select(&:last_activity_date).sort_by(&:last_activity_date).reverse
|
||||
@events = Event.where(:project_id => @projects.map(&:id)).recent.limit(40)
|
||||
end
|
||||
|
||||
def new
|
||||
|
@ -78,7 +79,6 @@ class ProjectsController < ApplicationController
|
|||
render "projects/empty"
|
||||
end
|
||||
end
|
||||
format.js
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue