From 8f4a0bd1743875289d5870b7d19ecb6c80016b6c Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Sun, 4 Dec 2011 22:34:39 +0200
Subject: [PATCH] fix filters & seeds

---
 app/controllers/projects_controller.rb |  2 +-
 app/controllers/refs_controller.rb     |  7 +++---
 app/models/project.rb                  |  2 +-
 db/fixtures/development/004_teams.rb   | 30 +++++++++++++-------------
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 11b4f0bf..a0899151 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -8,7 +8,7 @@ class ProjectsController < ApplicationController
   before_filter :add_project_abilities
   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]
+  before_filter :require_non_empty_project, :only => [:blob, :tree, :graph]
   before_filter :load_refs, :only => :tree # load @branch, @tag & @ref
 
   def index
diff --git a/app/controllers/refs_controller.rb b/app/controllers/refs_controller.rb
index fab732e2..66924b8d 100644
--- a/app/controllers/refs_controller.rb
+++ b/app/controllers/refs_controller.rb
@@ -1,14 +1,15 @@
 class RefsController < ApplicationController
   before_filter :project
-  before_filter :ref
-  before_filter :define_tree_vars, :only => [:tree, :blob]
-  layout "project"
 
   # Authorize
   before_filter :add_project_abilities
   before_filter :authorize_read_project!
   before_filter :require_non_empty_project
 
+  before_filter :ref
+  before_filter :define_tree_vars, :only => [:tree, :blob]
+  layout "project"
+
   def switch 
     new_path = if params[:destination] == "tree"
                  tree_project_ref_path(@project, params[:ref]) 
diff --git a/app/models/project.rb b/app/models/project.rb
index ae63efb6..e3fb9c94 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -180,7 +180,7 @@ class Project < ActiveRecord::Base
   end
 
   def repo_name
-    if path == "gitosis-admin"
+    if path == "gitosis-admin" && path == "gitolite-admin"
       errors.add(:path, " like 'gitosis-admin' is not allowed")
     end
   end
diff --git a/db/fixtures/development/004_teams.rb b/db/fixtures/development/004_teams.rb
index 69742e41..2ba8e18f 100644
--- a/db/fixtures/development/004_teams.rb
+++ b/db/fixtures/development/004_teams.rb
@@ -1,21 +1,21 @@
 UsersProject.seed(:id, [
-  { :id => 1,  :project_id => 1, :user_id => 1},
-  { :id => 2,  :project_id => 1, :user_id => 2},
-  { :id => 3,  :project_id => 1, :user_id => 3},
-  { :id => 4,  :project_id => 1, :user_id => 4},
-  { :id => 5,  :project_id => 1, :user_id => 5},
+  { :id => 1,  :project_id => 1, :user_id => 1, :read => true, :write => true,  :admin => true  },
+  { :id => 2,  :project_id => 1, :user_id => 2, :read => true, :write => false, :admin => false },
+  { :id => 3,  :project_id => 1, :user_id => 3, :read => true, :write => false, :admin => false },
+  { :id => 4,  :project_id => 1, :user_id => 4, :read => true, :write => false, :admin => false },
+  { :id => 5,  :project_id => 1, :user_id => 5, :read => true, :write => false, :admin => false },
 
-  { :id => 6,  :project_id => 2, :user_id => 1},
-  { :id => 7,  :project_id => 2, :user_id => 2},
-  { :id => 8,  :project_id => 2, :user_id => 3},
-  { :id => 9,  :project_id => 2, :user_id => 4},
-  { :id => 11, :project_id => 2, :user_id => 5},
+  { :id => 6,  :project_id => 2, :user_id => 1, :read => true, :write => true,  :admin => true  },
+  { :id => 7,  :project_id => 2, :user_id => 2, :read => true, :write => false, :admin => false },
+  { :id => 8,  :project_id => 2, :user_id => 3, :read => true, :write => false, :admin => false },
+  { :id => 9,  :project_id => 2, :user_id => 4, :read => true, :write => false, :admin => false },
+  { :id => 11, :project_id => 2, :user_id => 5, :read => true, :write => false, :admin => false },
 
-  { :id => 12, :project_id => 3, :user_id => 1},
-  { :id => 13, :project_id => 3, :user_id => 2},
-  { :id => 14, :project_id => 3, :user_id => 3},
-  { :id => 15, :project_id => 3, :user_id => 4},
-  { :id => 16, :project_id => 3, :user_id => 5}
+  { :id => 12, :project_id => 3, :user_id => 1, :read => true, :write => true,  :admin => true  },
+  { :id => 13, :project_id => 3, :user_id => 2, :read => true, :write => false, :admin => false },
+  { :id => 14, :project_id => 3, :user_id => 3, :read => true, :write => false, :admin => false },
+  { :id => 15, :project_id => 3, :user_id => 4, :read => true, :write => false, :admin => false },
+  { :id => 16, :project_id => 3, :user_id => 5, :read => true, :write => false, :admin => false }
 ])