33016.patch - Redmine

     <% content_for :header_tags do %>
       <%= stylesheet_link_tag 'scm' %>
     <% end %>
     <% if User.current.allowed_to?(:add_news_watchers, @project) ||
       (@news.watchers.present? && User.current.allowed_to?(:view_news_watchers, @project)) %>
     <% content_for :sidebar do %>
       <div id="watchers"><%= render :partial => 'watchers/watchers', :locals => {:watched => @news} %></div>
     <% end %>
     <% end %>

       permission_view_news: View news
       permission_manage_news: Manage news
       permission_comment_news: Comment news
       permission_view_news_watchers: View news watchers list
       permission_add_news_watchers: Add news watchers
       permission_delete_news_watchers: Delete news watchers
       permission_view_documents: View documents
       permission_add_documents: Add documents
       permission_edit_documents: Edit documents
-...
       label_generate_key: Generate a key
       label_issue_watchers: Watchers
       label_message_watchers: Watchers
       label_news_watchers: Watchers
       label_example: Example
       label_display: Display
       label_sort: Sort

         map.permission :view_news, {:news => [:index, :show]}, :read => true
         map.permission :manage_news, {:news => [:new, :create, :edit, :update, :destroy], :comments => [:destroy], :attachments => :upload}, :require => :member
         map.permission :comment_news, {:comments => :create}
         map.permission :view_news_watchers, {}, :read => true
         map.permission :add_news_watchers, {:watchers => [:new, :create, :autocomplete_for_user]}
         map.permission :delete_news_watchers, {:watchers => :destroy}
       end
       map.project_module :documents do |map|

         - :view_news
         - :manage_news
         - :comment_news
         - :view_news_watchers
         - :add_news_watchers
         - :delete_news_watchers
         - :view_documents
         - :add_documents
         - :edit_documents
-...
         - :view_news
         - :manage_news
         - :comment_news
         - :view_news_watchers
         - :view_documents
         - :add_documents
         - :edit_documents
-...
         - :view_news
         - :manage_news
         - :comment_news
         - :view_news_watchers
         - :view_documents
         - :add_documents
         - :edit_documents

     ---
     watchers_001:
     ---
     watchers_001:
       watchable_type: Issue
       watchable_id: 2
       user_id: 3
     watchers_002:
     watchers_002:
       watchable_type: Message
       watchable_id: 1
       user_id: 1
     watchers_003:
     watchers_003:
       watchable_type: Issue
       watchable_id: 2
       user_id: 1
     watchers_004:
       watchable_type: News
       watchable_id: 1
       user_id: 1

     class NewsControllerTest < Redmine::ControllerTest
       fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
                :enabled_modules, :news, :comments,
                :attachments, :user_preferences
                :attachments, :user_preferences, :watchers
       def setup
         User.current = nil
-...
         assert_equal ["This is an other comment", "my first comment"], comments
       end
       def test_show_should_display_watchers
         @request.session[:user_id] = 2
         news = News.find(1)
         news.add_watcher User.find(2)
         news.add_watcher Group.find(10)
         [['1', true], ['0', false]].each do |(gravatar_enabled, is_display_gravatar)|
           with_settings :gravatar_enabled => gravatar_enabled do
             get(:show, :params => {:id => 1})
           end
           assert_select 'div#watchers ul' do
             assert_select 'li.user-2' do
               assert_select 'img.gravatar[title=?]', 'John Smith', is_display_gravatar
               assert_select 'a[href="/users/2"]'
               assert_select 'a[class*=delete]'
             end
             assert_select 'li.user-10' do
               assert_select 'img.gravatar[title=?]', 'A Team', is_display_gravatar
               assert_select 'a[href="/users/10"]', false
               assert_select 'a[class*=delete]'
             end
           end
         end
       end
       def test_show_not_found
         get(:show, :params => {:id => 999})
         assert_response 404

     class WatchersControllerTest < Redmine::ControllerTest
       fixtures :projects, :users, :roles, :members, :member_roles, :enabled_modules,
                :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers,
                :boards, :messages
                :boards, :messages, :news
       def setup
         User.current = nil
-...
         assert_match /ajax-modal/, response.body
       end
       def test_new_for_news
         @request.session[:user_id] = 2
         get :new, :params => {:object_type => 'news', :object_id => '1'}, :xhr => true
         assert_response :success
         assert_match /ajax-modal/, response.body
       end
       def test_new_with_multiple_objects
         @request.session[:user_id] = 2
         get :new, :params => {:object_type => 'issue', :object_id => ['1', '2']}, :xhr => true
-...
         assert Message.find(1).watched_by?(User.find(4))
       end
       def test_create_for_news
         @request.session[:user_id] = 2
         assert_difference('Watcher.count') do
           post :create, :params => {
             :object_type => 'news', :object_id => '1',
             :watcher => {:user_id => '4'}
           }, :xhr => true
           assert_response :success
           assert_match /watchers/, response.body
           assert_match /ajax-modal/, response.body
         end
         assert News.find(1).watched_by?(User.find(4))
       end
       def test_create_with_mutiple_users
         @request.session[:user_id] = 2
         assert_difference('Watcher.count', 3) do
-...
         assert message.watched_by?(Group.find(10))
       end
       def test_create_for_news_with_mutiple_users
         @request.session[:user_id] = 2
         assert_difference('Watcher.count', 3) do
           post :create, :params => {
             :object_type => 'news', :object_id => '1',
             :watcher => {:user_ids => ['4', '7', '10']}
           }, :xhr => true
           assert_response :success
           assert_match /watchers/, response.body
           assert_match /ajax-modal/, response.body
         end
         news = News.find(1)
         assert news.watched_by?(User.find(4))
         assert news.watched_by?(User.find(7))
         assert news.watched_by?(Group.find(10))
       end
       def test_create_with_mutiple_objects
         @request.session[:user_id] = 2
         assert_difference('Watcher.count', 6) do
-...
         assert !message.watched_by?(user)
       end
       def test_destroy_for_news
         @request.session[:user_id] = 2
         news = News.find(1)
         user = User.find(1)
         assert news.watched_by?(user)
         assert_difference('Watcher.count', -1) do
           delete :destroy, :params => {
             :object_type => 'news', :object_id => '1', :user_id => '1'
           }, :xhr => true
           assert_response :success
           assert_match /watchers/, response.body
         end
         news.reload
         assert !news.watched_by?(user)
       end
       def test_destroy_locked_user
         user = User.find(3)
         user.lock!

Project

General

Profile

Redmine

Feature #33016 » 33016.patch