From: gitlabhq <m@gitlabhq.com>
Date: Tue, 18 Oct 2011 14:57:01 +0000 (+0300)
Subject: dashboard
X-Git-Tag: v1.2.0pre~112
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f8b5e5f78ebcd7f37a0dbfb299e96d918d9c40fa;p=wvm%2Fgitlab.git

dashboard
---

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7469b05b0..6bcc14b5b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -6,7 +6,7 @@ class ProjectsController < ApplicationController
   before_filter :authorize_read_project!, :except => [:index, :new, :create] 
   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
     @projects = current_user.projects.all
@@ -60,21 +60,25 @@ class ProjectsController < ApplicationController
   end
 
   def show
-    @date = case params[:view]
-            when "week" then Date.today - 7.days
-            else Date.today
-            end
-
-    @heads = @project.repo.heads
-    @commits = @heads.map do |h| 
-      @project.repo.log(h.name, nil, :since => @date - 1.day)
-    end.flatten.uniq { |c| c.id }
-    
-    @commits.sort! do |x, y|
-      y.committed_date <=> x.committed_date
-    end
+    if @project.repo_exists?
+      @date = case params[:view]
+              when "week" then Date.today - 7.days
+              else Date.today
+              end
+
+      @heads = @project.repo.heads
+      @commits = @heads.map do |h| 
+        @project.repo.log(h.name, nil, :since => @date - 1.day)
+      end.flatten.uniq { |c| c.id }
+
+      @commits.sort! do |x, y|
+        y.committed_date <=> x.committed_date
+      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
 
   #
diff --git a/spec/requests/projects_spec.rb b/spec/requests/projects_spec.rb
index 2825a6a97..a1bac0624 100644
--- a/spec/requests/projects_spec.rb
+++ b/spec/requests/projects_spec.rb
@@ -72,7 +72,10 @@ describe "Projects" do
       current_path.should == project_path(@project)
     end
 
-    it_behaves_like :tree_view
+    it "should beahave like dashboard" do 
+      page.should have_content("Recent history")
+    end
+
   end
 
   describe "GET /projects/team" do
@@ -134,8 +137,6 @@ describe "Projects" do
     it "should show project" do
       page.should have_content("Awesome")
     end
-
-    it_behaves_like :tree_view
   end
 
   #describe "DELETE /projects/:id", :js => true do