diff options
| -rw-r--r-- | app/controllers/projects/snippets_controller.rb | 12 | ||||
| -rw-r--r-- | app/views/projects/snippets/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/snippets/show.html.haml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index cd14c08c779..92e88de6790 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -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' @@ -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 diff --git a/app/views/projects/snippets/index.html.haml b/app/views/projects/snippets/index.html.haml index 12760d377f3..5971e3ffaac 100644 --- a/app/views/projects/snippets/index.html.haml +++ b/app/views/projects/snippets/index.html.haml @@ -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 diff --git a/app/views/projects/snippets/show.html.haml b/app/views/projects/snippets/show.html.haml index e325c3d84e6..db5a721dc45 100644 --- a/app/views/projects/snippets/show.html.haml +++ b/app/views/projects/snippets/show.html.haml @@ -1,7 +1,7 @@ %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 |