Skip to content

O
OHR Support
Commit 7a05f8ed authored by Jean-Philippe Lang's avatar Jean-Philippe Lang
Browse files
Options

Adds permissions to let users edit and/or delete their messages (#854, patch by… 

Adds permissions to let users edit and/or delete their messages (#854, patch by Markus Knittig with slight changes).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2019 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent cbacc71d
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 10 deletions
app/controllers/messages_controller.rb
View file @ 7a05f8ed
......@@ -19,7 +19,7 @@ class MessagesController < ApplicationController
menu_item :boards
before_filter :find_board, :only => [:new, :preview]
before_filter :find_message, :except => [:new, :preview]
before_filter :authorize, :except => :preview
before_filter :authorize, :except => [:preview, :edit, :destroy]
verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
verify :xhr => true, :only => :quote
......@@ -30,7 +30,7 @@ class MessagesController < ApplicationController
# Show a topic and its replies
def show
@replies = @topic.children
@replies = @topic.children.find(:all, :include => [:author, :attachments, {:board => :project}])
@replies.reverse! if User.current.wants_comments_in_reverse_order?
@reply = Message.new(:subject => "RE: #{@message.subject}")
render :action => "show", :layout => false if request.xhr?
......@@ -65,7 +65,8 @@ class MessagesController < ApplicationController
# Edit a message
def edit
if params[:message] && User.current.allowed_to?(:edit_messages, @project)
render_403 and return false unless @message.editable_by?(User.current)
if params[:message]
@message.locked = params[:message]['locked']
@message.sticky = params[:message]['sticky']
end
......@@ -78,6 +79,7 @@ class MessagesController < ApplicationController
# Delete a messages
def destroy
render_403 and return false unless @message.destroyable_by?(User.current)
@message.destroy
redirect_to @message.parent.nil? ?
{ :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
......
app/models/message.rb
View file @ 7a05f8ed
......@@ -71,6 +71,14 @@ class Message < ActiveRecord::Base
def project
board.project
end
def editable_by?(usr)
usr && usr.logged? && (usr.allowed_to?(:edit_messages, project) || (self.author == usr && usr.allowed_to?(:edit_own_messages, project)))
end
def destroyable_by?(usr)
usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project)))
end
private
......
app/views/messages/show.rhtml
View file @ 7a05f8ed
......@@ -4,8 +4,8 @@
<div class="contextual">
<%= watcher_tag(@topic, User.current) %>
<%= link_to_remote_if_authorized l(:button_quote), { :url => {:action => 'quote', :id => @topic} }, :class => 'icon icon-comment' %>
<%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit' %>
<%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
<%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit') if @message.editable_by?(User.current) %>
<%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') if @message.destroyable_by?(User.current) %>
</div>
<h2><%=h @topic.subject %></h2>
......@@ -25,8 +25,8 @@
<a name="<%= "message-#{message.id}" %>"></a>
<div class="contextual">
<%= link_to_remote_if_authorized image_tag('comment.png'), { :url => {:action => 'quote', :id => message} }, :title => l(:button_quote) %>
<%= link_to_if_authorized image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit) %>
<%= link_to_if_authorized image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete) %>
<%= link_to(image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit)) if message.editable_by?(User.current) %>
<%= link_to(image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if message.destroyable_by?(User.current) %>
</div>
<div class="message reply">
<h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
......
lang/bg.yml
View file @ 7a05f8ed
......@@ -690,3 +690,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/ca.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/cs.yml
View file @ 7a05f8ed
......@@ -695,3 +695,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/da.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/de.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/en.yml
View file @ 7a05f8ed
......@@ -269,7 +269,9 @@ permission_manage_boards: Manage boards
permission_view_messages: View messages
permission_add_messages: Post messages
permission_edit_messages: Edit messages
permission_edit_own_messages: Edit own messages
permission_delete_messages: Delete messages
permission_delete_won_messages: Delete own messages
project_module_issue_tracking: Issue tracking
project_module_time_tracking: Time tracking
......
lang/es.yml
View file @ 7a05f8ed
......@@ -693,3 +693,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/fi.yml
View file @ 7a05f8ed
......@@ -690,3 +690,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/fr.yml
View file @ 7a05f8ed
......@@ -270,7 +270,9 @@ permission_manage_boards: Gérer les forums
permission_view_messages: Voir les messages
permission_add_messages: Poster un message
permission_edit_messages: Modifier les messages
permission_edit_own_messages: Modifier ses propres messages
permission_delete_messages: Supprimer les messages
permission_delete_won_messages: Supprimer ses propres messages
project_module_issue_tracking: Suivi des demandes
project_module_time_tracking: Suivi du temps passé
......
lang/he.yml
View file @ 7a05f8ed
......@@ -690,3 +690,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/hu.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Saját jegyzetek szerkesztése
setting_gravatar_enabled: Felhasználói fényképek engedélyezése
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/it.yml
View file @ 7a05f8ed
......@@ -690,3 +690,5 @@ permission_edit_own_issue_notes: Modifica proprie note
setting_gravatar_enabled: Usa icone utente Gravatar
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/ja.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/ko.yml
View file @ 7a05f8ed
......@@ -690,3 +690,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/lt.yml
View file @ 7a05f8ed
......@@ -692,3 +692,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/nl.yml
View file @ 7a05f8ed
......@@ -692,3 +692,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/no.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/pl.yml
View file @ 7a05f8ed
......@@ -725,3 +725,5 @@ setting_gravatar_enabled: Używaj ikon użytkowników Gravatar
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/pt-br.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Editar próprias notas
setting_gravatar_enabled: Usar ícones do Gravatar
label_example: Exemplo
text_repository_usernames_mapping: "Seleciona ou atualiza os usuários do Redmine mapeando para cada usuário encontrado no log do repositório.\nUsuários com o mesmo login ou email no Redmine e no repositório serão mapeados automaticamente."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/pt.yml
View file @ 7a05f8ed
......@@ -692,3 +692,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/ro.yml
View file @ 7a05f8ed
......@@ -690,3 +690,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/ru.yml
View file @ 7a05f8ed
......@@ -723,3 +723,5 @@ text_user_wrote: '%s написал(а):'
text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную Wiki и все ее содержимое?
text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/sk.yml
View file @ 7a05f8ed
......@@ -695,3 +695,5 @@ permission_edit_own_issue_notes: Editácia vlastných poznámok úlohy
setting_gravatar_enabled: Použitie uživateľských Gravatar ikon
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/sr.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/sv.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/th.yml
View file @ 7a05f8ed
......@@ -693,3 +693,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/tr.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/uk.yml
View file @ 7a05f8ed
......@@ -692,3 +692,5 @@ permission_edit_own_issue_notes: Edit own notes
setting_gravatar_enabled: Use Gravatar user icons
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/vn.yml
View file @ 7a05f8ed
......@@ -691,3 +691,5 @@ permission_edit_time_entries: Edit time logs
permission_edit_own_time_entries: Edit own time logs
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/zh-tw.yml
View file @ 7a05f8ed
......@@ -692,3 +692,5 @@ enumeration_issue_priorities: 項目優先權
enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤)
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lang/zh.yml
View file @ 7a05f8ed
......@@ -692,3 +692,5 @@ enumeration_doc_categories: 文档类别
enumeration_activities: 活动（时间跟踪）
label_example: Example
text_repository_usernames_mapping: "Select ou update the Redmine user mapped to each username found in the repository log.\nUsers with the same Redmine and repository username or email are automatically mapped."
permission_edit_own_messages: Edit own messages
permission_delete_won_messages: Delete own messages
lib/redmine.rb
View file @ 7a05f8ed
......@@ -99,7 +99,9 @@ Redmine::AccessControl.map do |map|
map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
map.permission :add_messages, {:messages => [:new, :reply, :quote]}
map.permission :edit_messages, {:messages => :edit}, :require => :member
map.permission :edit_own_messages, {:messages => :edit}, :require => :loggedin
map.permission :delete_messages, {:messages => :destroy}, :require => :member
map.permission :delete_own_messages, {:messages => :destroy}, :require => :loggedin
end
end
......
lib/redmine/default_data/loader.rb
View file @ 7a05f8ed
......@@ -65,6 +65,7 @@ module Redmine
:edit_wiki_pages,
:delete_wiki_pages,
:add_messages,
:edit_own_messages,
:view_files,
:manage_files,
:browse_repository,
......@@ -85,6 +86,7 @@ module Redmine
:view_wiki_pages,
:view_wiki_edits,
:add_messages,
:edit_own_messages,
:view_files,
:browse_repository,
:view_changesets]
......
test/fixtures/messages.yml
View file @ 7a05f8ed
......@@ -38,8 +38,8 @@ messages_004:
updated_on: 2007-08-12 17:15:32 +02:00
subject: Post 2
id: 4
replies_count: 1
last_reply_id: 5
replies_count: 2
last_reply_id: 6
content: "This is an other post"
author_id:
parent_id:
......@@ -55,3 +55,14 @@ messages_005:
author_id: 1
parent_id: 4
board_id: 1
messages_006:
created_on: <%= 2.days.ago.to_date.to_s(:db) %>
updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
subject: 'RE: post 2'
id: 6
replies_count: 0
last_reply_id:
content: "Another reply to the second post"
author_id: 3
parent_id: 4
board_id: 1
test/fixtures/roles.yml
View file @ 7a05f8ed
......@@ -80,6 +80,8 @@ roles_002:
- :protect_wiki_pages
- :delete_wiki_pages
- :add_messages
- :edit_own_messages
- :delete_own_messages
- :manage_boards
- :view_files
- :manage_files
......
test/unit/message_test.rb
View file @ 7a05f8ed
require File.dirname(__FILE__) + '/../test_helper'
class MessageTest < Test::Unit::TestCase
fixtures :projects, :boards, :messages, :users, :watchers
fixtures :projects, :roles, :members, :boards, :messages, :users, :watchers
def setup
@board = Board.find(1)
......@@ -76,4 +76,22 @@ class MessageTest < Test::Unit::TestCase
assert_equal topics_count, board.topics_count
assert_equal messages_count - 1, board.messages_count
end
def test_editable_by
message = Message.find(6)
author = message.author
assert message.editable_by?(author)
author.role_for_project(message.project).remove_permission!(:edit_own_messages)
assert !message.reload.editable_by?(author.reload)
end
def test_destroyable_by
message = Message.find(6)
author = message.author
assert message.destroyable_by?(author)
author.role_for_project(message.project).remove_permission!(:delete_own_messages)
assert !message.reload.destroyable_by?(author.reload)
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment