Skip to content
Snippets Groups Projects
Commit e3351287 authored by Andrew8xx8's avatar Andrew8xx8
Browse files

Permissions for Project Snippet fixed

parent 033037a0
No related branches found
No related tags found
1 merge request!3351Personal snipepts support added
Loading
Loading
@@ -3,16 +3,16 @@ class Projects::SnippetsController < Projects::ApplicationController
before_filter :snippet, only: [:show, :edit, :destroy, :update, :raw]
 
# Allow read any snippet
before_filter :authorize_read_snippet!
before_filter :authorize_read_project_snippet!
 
# Allow write(create) snippet
before_filter :authorize_write_snippet!, only: [:new, :create]
before_filter :authorize_write_project_snippet!, only: [:new, :create]
 
# Allow modify snippet
before_filter :authorize_modify_snippet!, only: [:edit, :update]
before_filter :authorize_modify_project_snippet!, only: [:edit, :update]
 
# Allow destroy snippet
before_filter :authorize_admin_snippet!, only: [:destroy]
before_filter :authorize_admin_project_snippet!, only: [:destroy]
 
layout 'project_resource'
 
Loading
Loading
@@ -80,11 +80,11 @@ class Projects::SnippetsController < Projects::ApplicationController
@snippet ||= @project.snippets.find(params[:id])
end
 
def authorize_modify_snippet!
def authorize_modify_project_snippet!
return render_404 unless can?(current_user, :modify_project_snippet, @snippet)
end
 
def authorize_admin_snippet!
def authorize_admin_project_snippet!
return render_404 unless can?(current_user, :admin_project_snippet, @snippet)
end
 
Loading
Loading
Loading
Loading
@@ -2,7 +2,7 @@
Snippets
%small share code pastes with others out of git repository
 
- if can? current_user, :write_snippet, @project
- if can? current_user, :write_project_snippet, @project
= link_to new_project_snippet_path(@project), class: "btn btn-small add_new pull-right", title: "New Snippet" do
Add new snippet
%br
Loading
Loading
%h3.page_title
= @snippet.title
%small= @snippet.file_name
- if can?(current_user, :admin_snippet, @project) || @snippet.author == current_user
- if can?(current_user, :admin_project_snippet, @project) || @snippet.author == current_user
= link_to "Edit", edit_project_snippet_path(@project, @snippet), class: "btn btn-small pull-right", title: 'Edit Snippet'
 
%br
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment