Download as
Browse Code »

Commit 8f4a0bd1743875289d5870b7d19ecb6c80016b6c

Authored by Dmitriy Zaporozhets
1 parent 03e51c30
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

fix filters & seeds

Showing 4 changed files with 21 additions and 20 deletions   Show diff stats
app/controllers/projects_controller.rb
  Diff comments   View file @8f4a0bd
@@ -8,7 +8,7 @@ class ProjectsController < ApplicationController @@ -8,7 +8,7 @@ class ProjectsController < ApplicationController
8 before_filter :add_project_abilities 8 before_filter :add_project_abilities
9 before_filter :authorize_read_project!, :except => [:index, :new, :create] 9 before_filter :authorize_read_project!, :except => [:index, :new, :create]
10 before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy] 10 before_filter :authorize_admin_project!, :only => [:edit, :update, :destroy]
11 - before_filter :require_non_empty_project, :only => [:blob, :tree] 11 + before_filter :require_non_empty_project, :only => [:blob, :tree, :graph]
12 before_filter :load_refs, :only => :tree # load @branch, @tag & @ref 12 before_filter :load_refs, :only => :tree # load @branch, @tag & @ref
13 13
14 def index 14 def index
app/controllers/refs_controller.rb
  Diff comments   View file @8f4a0bd
1 class RefsController < ApplicationController 1 class RefsController < ApplicationController
2 before_filter :project 2 before_filter :project
3 - before_filter :ref  
4 - before_filter :define_tree_vars, :only => [:tree, :blob]  
5 - layout "project"  
6 3
7 # Authorize 4 # Authorize
8 before_filter :add_project_abilities 5 before_filter :add_project_abilities
9 before_filter :authorize_read_project! 6 before_filter :authorize_read_project!
10 before_filter :require_non_empty_project 7 before_filter :require_non_empty_project
11 8
  9 + before_filter :ref
  10 + before_filter :define_tree_vars, :only => [:tree, :blob]
  11 + layout "project"
  12 +
12 def switch 13 def switch
13 new_path = if params[:destination] == "tree" 14 new_path = if params[:destination] == "tree"
14 tree_project_ref_path(@project, params[:ref]) 15 tree_project_ref_path(@project, params[:ref])
app/models/project.rb
  Diff comments   View file @8f4a0bd
@@ -180,7 +180,7 @@ class Project &lt; ActiveRecord::Base @@ -180,7 +180,7 @@ class Project &lt; ActiveRecord::Base
180 end 180 end
181 181
182 def repo_name 182 def repo_name
183 - if path == "gitosis-admin" 183 + if path == "gitosis-admin" && path == "gitolite-admin"
184 errors.add(:path, " like 'gitosis-admin' is not allowed") 184 errors.add(:path, " like 'gitosis-admin' is not allowed")
185 end 185 end
186 end 186 end
db/fixtures/development/004_teams.rb
  Diff comments   View file @8f4a0bd
1 UsersProject.seed(:id, [ 1 UsersProject.seed(:id, [
2 - { :id => 1, :project_id => 1, :user_id => 1},  
3 - { :id => 2, :project_id => 1, :user_id => 2},  
4 - { :id => 3, :project_id => 1, :user_id => 3},  
5 - { :id => 4, :project_id => 1, :user_id => 4},  
6 - { :id => 5, :project_id => 1, :user_id => 5}, 2 + { :id => 1, :project_id => 1, :user_id => 1, :read => true, :write => true, :admin => true },
  3 + { :id => 2, :project_id => 1, :user_id => 2, :read => true, :write => false, :admin => false },
  4 + { :id => 3, :project_id => 1, :user_id => 3, :read => true, :write => false, :admin => false },
  5 + { :id => 4, :project_id => 1, :user_id => 4, :read => true, :write => false, :admin => false },
  6 + { :id => 5, :project_id => 1, :user_id => 5, :read => true, :write => false, :admin => false },
7 7
8 - { :id => 6, :project_id => 2, :user_id => 1},  
9 - { :id => 7, :project_id => 2, :user_id => 2},  
10 - { :id => 8, :project_id => 2, :user_id => 3},  
11 - { :id => 9, :project_id => 2, :user_id => 4},  
12 - { :id => 11, :project_id => 2, :user_id => 5}, 8 + { :id => 6, :project_id => 2, :user_id => 1, :read => true, :write => true, :admin => true },
  9 + { :id => 7, :project_id => 2, :user_id => 2, :read => true, :write => false, :admin => false },
  10 + { :id => 8, :project_id => 2, :user_id => 3, :read => true, :write => false, :admin => false },
  11 + { :id => 9, :project_id => 2, :user_id => 4, :read => true, :write => false, :admin => false },
  12 + { :id => 11, :project_id => 2, :user_id => 5, :read => true, :write => false, :admin => false },
13 13
14 - { :id => 12, :project_id => 3, :user_id => 1},  
15 - { :id => 13, :project_id => 3, :user_id => 2},  
16 - { :id => 14, :project_id => 3, :user_id => 3},  
17 - { :id => 15, :project_id => 3, :user_id => 4},  
18 - { :id => 16, :project_id => 3, :user_id => 5} 14 + { :id => 12, :project_id => 3, :user_id => 1, :read => true, :write => true, :admin => true },
  15 + { :id => 13, :project_id => 3, :user_id => 2, :read => true, :write => false, :admin => false },
  16 + { :id => 14, :project_id => 3, :user_id => 3, :read => true, :write => false, :admin => false },
  17 + { :id => 15, :project_id => 3, :user_id => 4, :read => true, :write => false, :admin => false },
  18 + { :id => 16, :project_id => 3, :user_id => 5, :read => true, :write => false, :admin => false }
19 ]) 19 ])
20 20
21 21