Skip to content
Snippets Groups Projects
Verified Commit 01520d5d authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Dont allow edit or remove of system notes

parent 36361f4e
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -30,8 +30,10 @@ class Projects::NotesController < Projects::ApplicationController
end
 
def update
note.update_attributes(note_params)
note.reset_events_cache
if note.editable?
note.update_attributes(note_params)
note.reset_events_cache
end
 
respond_to do |format|
format.json { render_note_json(note) }
Loading
Loading
@@ -40,8 +42,10 @@ class Projects::NotesController < Projects::ApplicationController
end
 
def destroy
note.destroy
note.reset_events_cache
if note.editable?
note.destroy
note.reset_events_cache
end
 
respond_to do |format|
format.js { render nothing: true }
Loading
Loading
Loading
Loading
@@ -337,4 +337,8 @@ class Note < ActiveRecord::Base
def set_references
notice_added_references(project, author)
end
def editable?
!system
end
end
Loading
Loading
@@ -9,7 +9,7 @@
%i.icon-link
Link here
&nbsp;
- if(note.author_id == current_user.try(:id)) || can?(current_user, :admin_note, @project)
- if can?(current_user, :admin_note, note) && note.editable?
= link_to "#", title: "Edit comment", class: "js-note-edit" do
%i.icon-edit
Edit
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