deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

dashboard

Browse source
This commit is contained in:
gitlabhq 2011-10-18 17:57:01 +03:00
parent 1a03b17ab5
commit f8b5e5f78e
2 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/projects_controller.rb
View file

@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
before_filter :authorize_read_project!, :except => [:index, :new, :create] before_filter :authorize_read_project!, :except => [:index, :new, :create]
before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
before_filter :require_non_empty_project, :only => [:blob, :tree, :show] before_filter :require_non_empty_project, :only => [:blob, :tree]
def index def index
@projects = current_user.projects.all @projects = current_user.projects.all
@ -60,6 +60,7 @@ class ProjectsController < ApplicationController
end end
def show def show
if @project.repo_exists?
@date = case params[:view] @date = case params[:view]
when "week" then Date.today - 7.days when "week" then Date.today - 7.days
else Date.today else Date.today
@ -75,6 +76,9 @@ class ProjectsController < ApplicationController
end end
@messages = project.notes.since(@date).limit(40).order("created_at DESC") @messages = project.notes.since(@date).limit(40).order("created_at DESC")
else
return render "projects/empty"
end
end end
# #

7
spec/requests/projects_spec.rb
View file

@ -72,7 +72,10 @@ describe "Projects" do
current_path.should == project_path(@project) current_path.should == project_path(@project)
end end
it_behaves_like :tree_view it "should beahave like dashboard" do
page.should have_content("Recent history")
end
end end
describe "GET /projects/team" do describe "GET /projects/team" do
@ -134,8 +137,6 @@ describe "Projects" do
it "should show project" do it "should show project" do
page.should have_content("Awesome") page.should have_content("Awesome")
end end
it_behaves_like :tree_view
end end
#describe "DELETE /projects/:id", :js => true do #describe "DELETE /projects/:id", :js => true do