Download as
Browse Code »

Commit e3351287b4284af95390835bc75a6c3c461f04ba

Authored by Andrew8xx8
1 parent 033037a0
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Permissions for Project Snippet fixed

Showing 3 changed files with 8 additions and 8 deletions   Show diff stats
app/controllers/projects/snippets_controller.rb
  Diff comments   View file @e335128
@@ -3,16 +3,16 @@ class Projects::SnippetsController < Projects::ApplicationController @@ -3,16 +3,16 @@ class Projects::SnippetsController < Projects::ApplicationController
3 before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw] 3 before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
4 4
5 # Allow read any snippet 5 # Allow read any snippet
6 - before_filter :authorize_read_snippet! 6 + before_filter :authorize_read_project_snippet!
7 7
8 # Allow write(create) snippet 8 # Allow write(create) snippet
9 - before_filter :authorize_write_snippet!, only: [:new, :create] 9 + before_filter :authorize_write_project_snippet!, only: [:new, :create]
10 10
11 # Allow modify snippet 11 # Allow modify snippet
12 - before_filter :authorize_modify_snippet!, only: [:edit, :update] 12 + before_filter :authorize_modify_project_snippet!, only: [:edit, :update]
13 13
14 # Allow destroy snippet 14 # Allow destroy snippet
15 - before_filter :authorize_admin_snippet!, only: [:destroy] 15 + before_filter :authorize_admin_project_snippet!, only: [:destroy]
16 16
17 layout 'project_resource' 17 layout 'project_resource'
18 18
@@ -80,11 +80,11 @@ class Projects::SnippetsController < Projects::ApplicationController @@ -80,11 +80,11 @@ class Projects::SnippetsController < Projects::ApplicationController
80 @snippet ||= @project.snippets.find(params[:id]) 80 @snippet ||= @project.snippets.find(params[:id])
81 end 81 end
82 82
83 - def authorize_modify_snippet! 83 + def authorize_modify_project_snippet!
84 return render_404 unless can?(current_user, :modify_project_snippet, @snippet) 84 return render_404 unless can?(current_user, :modify_project_snippet, @snippet)
85 end 85 end
86 86
87 - def authorize_admin_snippet! 87 + def authorize_admin_project_snippet!
88 return render_404 unless can?(current_user, :admin_project_snippet, @snippet) 88 return render_404 unless can?(current_user, :admin_project_snippet, @snippet)
89 end 89 end
90 90
app/views/projects/snippets/index.html.haml
  Diff comments   View file @e335128
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 Snippets 2 Snippets
3 %small share code pastes with others out of git repository 3 %small share code pastes with others out of git repository
4 4
5 - - if can? current_user, :write_snippet, @project 5 + - if can? current_user, :write_project_snippet, @project
6 = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do 6 = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
7 Add new snippet 7 Add new snippet
8 %br 8 %br
app/views/projects/snippets/show.html.haml
  Diff comments   View file @e335128
1 %h3.page_title 1 %h3.page_title
2 = @snippet.title 2 = @snippet.title
3 %small= @snippet.file_name 3 %small= @snippet.file_name
4 - - if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user 4 + - if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
5 = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet' 5 = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
6 6
7 %br 7 %br