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 3 before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
4 4  
5 5 # Allow read any snippet
6   - before_filter :authorize_read_snippet!
  6 + before_filter :authorize_read_project_snippet!
7 7  
8 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 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 14 # Allow destroy snippet
15   - before_filter :authorize_admin_snippet!, only: [:destroy]
  15 + before_filter :authorize_admin_project_snippet!, only: [:destroy]
16 16  
17 17 layout 'project_resource'
18 18  
... ... @@ -80,11 +80,11 @@ class Projects::SnippetsController < Projects::ApplicationController
80 80 @snippet ||= @project.snippets.find(params[:id])
81 81 end
82 82  
83   - def authorize_modify_snippet!
  83 + def authorize_modify_project_snippet!
84 84 return render_404 unless can?(current_user, :modify_project_snippet, @snippet)
85 85 end
86 86  
87   - def authorize_admin_snippet!
  87 + def authorize_admin_project_snippet!
88 88 return render_404 unless can?(current_user, :admin_project_snippet, @snippet)
89 89 end
90 90  
... ...
app/views/projects/snippets/index.html.haml
  Diff comments   View file @e335128
... ... @@ -2,7 +2,7 @@
2 2 Snippets
3 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 6 = link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
7 7 Add new snippet
8 8 %br
... ...
app/views/projects/snippets/show.html.haml
  Diff comments   View file @e335128
1 1 %h3.page_title
2 2 = @snippet.title
3 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 5 = link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
6 6  
7 7 %br
... ...