replace permissions by core's

app/controllers/rb_impediments_controller.rb

@@ -75,7 +75,7 @@ class RbImpedimentsController < RbApplicationController
 
     # We block block_ids only when user is not allowed to create or update the
     # instance passed.
-    unless instance && ((instance.new_record? && User.current.allowed_to?(:create_impediments, @project)) || User.current.allowed_to?(:update_impediments, @project))
+    unless instance && ((instance.new_record? && User.current.allowed_to?(:add_work_packages, @project)) || User.current.allowed_to?(:edit_work_packages, @project))
       hash.delete(:block_ids)
     end
 

app/seeders/role_seeder.rb

@@ -6,12 +6,6 @@ module BasicData
           member[:permissions].concat %i(
             view_master_backlog
             view_taskboards
-            create_stories
-            update_stories
-            create_tasks
-            update_tasks
-            create_impediments
-            update_impediments
           )
         end
       end

app/views/rb_impediments/_impediment.html.erb

@@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<% prevent_edit = User.current.allowed_to?(:update_impediments, defined?(project) ? project : impediment.project) ? '' : 'prevent_edit'%>
+<% prevent_edit = User.current.allowed_to?(:edit_work_packages, defined?(project) ? project : impediment.project) ? '' : 'prevent_edit'%>
 <div class="model work_package impediment <%= color_contrast_class(impediment) %> <%= prevent_edit %> <%= mark_if_closed(impediment) %><%= color_contrast_class(impediment) %>" id="work_package_<%= impediment.id %>" <%= build_inline_style(impediment) %>>
   <div class="id">
     <div class="t"><%= work_package_link_or_empty(impediment) %></div>

app/views/rb_taskboards/show.html.erb

@@ -69,7 +69,7 @@ See doc/COPYRIGHT.rdoc for more details.
     <table id="impediments" class="board" cellspacing="0">
       <tr>
         <td><div class="label_sprint_impediments"><%= l(:label_sprint_impediments) %></div></td>
-        <% if User.current.allowed_to?(:create_impediments, @project) %>
+        <% if User.current.allowed_to?(:add_work_packages, @project) %>
           <td class ="add_new clickable">+</td>
         <% else %>
           <td class ="add_new"></td>
@@ -113,7 +113,7 @@ See doc/COPYRIGHT.rdoc for more details.
               </div>
             </div>
           </td>
-          <% if User.current.allowed_to?(:create_tasks, @project) %>
+          <% if User.current.allowed_to?(:add_work_packages, @project) %>
             <td class ="add_new clickable">+</td>
           <% else %>
             <td class ="add_new"></td>

app/views/rb_tasks/_task.html.erb

@@ -34,7 +34,7 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
-<% prevent_edit = User.current.allowed_to?(:update_tasks, defined?(project) ? project : task.project) ? '' : 'prevent_edit'%>
+<% prevent_edit = User.current.allowed_to?(:edit_work_packages, defined?(project) ? project : task.project) ? '' : 'prevent_edit'%>
 <div class="model work_package task <%= color_contrast_class(task) %> <%= prevent_edit %> <%= mark_if_closed(task) %>" id="work_package_<%= task.id %>" <%= build_inline_style(task) %>>
   <div class="id">
     <div class="t"><%= work_package_link_or_empty(task) %></div>

config/locales/en.yml

@@ -169,12 +169,6 @@ en:
   permission_view_master_backlog: "View master backlog"
   permission_view_taskboards: "View taskboards"
   permission_update_sprints: "Update sprints"
-  permission_create_stories: "Create stories"
-  permission_update_stories: "Update stories"
-  permission_create_tasks: "Create tasks"
-  permission_update_tasks: "Update tasks"
-  permission_create_impediments: "Create impediments"
-  permission_update_impediments: "Update impediments"
 
   points_accepted: "points accepted"
   points_committed: "points committed"

features/common.feature

@@ -51,8 +51,6 @@ Feature: Common
     And the role "team member" may have the following rights:
         | view_master_backlog |
         | view_taskboards     |
-        | create_tasks        |
-        | update_tasks        |
         | view_work_packages  |
         | edit_work_packages  |
         | manage_subtasks     |

features/edit_story.feature

@@ -58,8 +58,6 @@ Feature: Edit story on backlogs view
     And there is a role "team member"
     And the role "team member" may have the following rights:
         | view_master_backlog   |
-        | create_stories        |
-        | update_stories        |
         | view_work_packages    |
         | edit_work_packages    |
         | add_work_packages     |

features/edit_story_tracker_and_status.feature

@@ -60,9 +60,8 @@ Feature: Edit story type and status
     And the user "romano" is a "manager"
     And the role "manager" may have the following rights:
         | view_master_backlog   |
-        | create_stories        |
-        | update_stories        |
         | view_work_packages    |
+        | add_work_packages     |
         | edit_work_packages    |
         | manage_subtasks       |
     And the project has the following sprints:

features/export_card_configurations.feature

@@ -58,8 +58,6 @@ Feature: Export sprint stories as PDF on the Backlogs view
     And there is a role "team member"
     And the role "team member" may have the following rights:
         | view_master_backlog   |
-        | create_stories        |
-        | update_stories        |
         | view_work_packages    |
         | edit_work_packages    |
         | add_work_packages     |
@@ -100,4 +98,4 @@ Feature: Export sprint stories as PDF on the Backlogs view
     And I follow "Export" of the "Sprint 001" backlogs menu
     And I should see a modal window
     And I click on the link on the modal window with text "Custom 2"
-    Then the PDF download dialog should be displayed
+    Then the PDF download dialog should be displayed

features/fixed_version_by_issue_hierarchy.feature

@@ -50,16 +50,11 @@ Feature: The work_package hierarchy defines the allowed versions for each work_p
         | view_master_backlog     |
         | view_taskboards         |
         | update_sprints          |
-        | update_stories          |
-        | create_impediments      |
-        | update_impediments      |
-        | update_tasks            |
         | view_wiki_pages         |
         | edit_wiki_pages         |
         | view_work_packages      |
         | edit_work_packages      |
         | manage_subtasks         |
-        | create_tasks            |
         | add_work_packages       |
     And there are the following issue status:
         | name        | is_closed  | is_default  |

features/foldable_versions.feature

@@ -46,7 +46,6 @@ Feature: Foldable versions in master backlog
         | view_master_backlog     |
         | view_taskboards         |
         | update_sprints          |
-        | update_stories          |
         | view_wiki_pages         |
         | edit_wiki_pages         |
         | view_work_packages      |

features/issue_hierarchy_restriction_project_boundaries.feature

@@ -49,19 +49,12 @@ Feature: The work_package hierarchy between backlogs stories and backlogs tasks
     And the role "scrum master" may have the following rights:
         | view_master_backlog     |
         | view_taskboards         |
-        | update_sprints          |
-        | update_stories          |
-        | create_impediments      |
-        | update_impediments      |
-        | update_tasks            |
         | view_wiki_pages         |
         | edit_wiki_pages         |
         | view_work_packages      |
+        | add_work_packages       |
         | edit_work_packages      |
         | manage_subtasks         |
-        | create_tasks            |
-        | add_work_packages              |
-        | add_work_packages       |
     And the backlogs module is initialized
     And the following types are configured to track stories:
         | Story |

features/product_owner.feature

@@ -51,12 +51,10 @@ Feature: Product Owner
       And there is a role "product owner"
       And the role "product owner" may have the following rights:
           | view_master_backlog   |
-          | create_stories        |
-          | update_stories        |
           | view_work_packages    |
+          | add_work_packages     |
           | edit_work_packages    |
           | manage_subtasks       |
-          | add_work_packages     |
 
       And the type "Story" has the default workflow for the role "product owner"
       And the type "Epic" has the default workflow for the role "product owner"

features/scrum_master.feature

@@ -49,11 +49,7 @@ Feature: Scrum Master
         | view_master_backlog     |
         | view_taskboards         |
         | update_sprints          |
-        | update_stories          |
-        | create_impediments      |
-        | update_impediments      |
         | add_work_packages       |
-        | update_tasks            |
         | view_wiki_pages         |
         | edit_wiki_pages         |
         | view_work_packages      |

features/shared_versions.feature

@@ -70,8 +70,7 @@ Feature: Shared Versions
         | manage_versions     |
         | view_work_packages  |
         | view_master_backlog |
-        | create_stories      |
-        | update_stories      |
+        | add_work_packages   |
         | edit_work_packages  |
         | manage_subtasks     |
     And the user "padme" is a "project admin"

features/show_story.feature

@@ -46,13 +46,10 @@ Feature: Show story
       | view_master_backlog     |
       | view_taskboards         |
       | update_sprints          |
-      | update_stories          |
-      | create_impediments      |
-      | update_impediments      |
-      | update_tasks            |
       | view_wiki_pages         |
       | edit_wiki_pages         |
       | view_work_packages      |
+      | add_work_packages       |
       | edit_work_packages      |
       | manage_subtasks         |
     And the backlogs module is initialized

features/team_member.feature

@@ -61,8 +61,6 @@ Feature: Team Member
     And the role "team member" may have the following rights:
         | view_master_backlog |
         | view_taskboards     |
-        | create_tasks        |
-        | update_tasks        |
         | view_work_packages  |
         | edit_work_packages  |
         | manage_subtasks     |

lib/open_project/backlogs/engine.rb

@@ -59,6 +59,19 @@ module OpenProject::Backlogs
       Redmine::AccessControl.permission(:edit_project).actions << 'projects/project_done_statuses'
       Redmine::AccessControl.permission(:edit_project).actions << 'projects/rebuild_positions'
 
+      Redmine::AccessControl.permission(:add_work_packages).tap do |add|
+        add.actions << 'rb_stories/create'
+        add.actions << 'rb_tasks/create'
+        add.actions << 'rb_impediments/create'
+      end
+
+      Redmine::AccessControl.permission(:edit_work_packages).tap do |edit|
+        edit.actions << 'rb_stories/update'
+        edit.actions << 'rb_tasks/update'
+        edit.actions << 'rb_impediments/update'
+      end
+
+
       project_module :backlogs do
         # SYNTAX: permission :name_of_permission, { :controller_name => [:action1, :action2] }
 
@@ -84,21 +97,6 @@ module OpenProject::Backlogs
         # :show_sprints and :list_sprints are implicit in :view_master_backlog permission
         permission :update_sprints,                rb_sprints: [:edit, :update],
                                                    rb_wikis:   [:edit, :update]
-
-        # Story permissions
-        # :show_stories and :list_stories are implicit in :view_master_backlog permission
-        permission :create_stories,         rb_stories: :create
-        permission :update_stories,         rb_stories: :update
-
-        # Task permissions
-        # :show_tasks and :list_tasks are implicit in :view_sprints
-        permission :create_tasks,           rb_tasks: [:new, :create]
-        permission :update_tasks,           rb_tasks: [:edit, :update]
-
-        # Impediment permissions
-        # :show_impediments and :list_impediments are implicit in :view_sprints
-        permission :create_impediments,     rb_impediments: [:new, :create]
-        permission :update_impediments,     rb_impediments: [:edit, :update]
       end
 
       menu :project_menu,

spec/views/rb_burndown_charts/show_spec.rb

@@ -40,7 +40,7 @@ describe 'rb_burndown_charts/show', type: :view do
   let(:user2) { FactoryGirl.create(:user) }
   let(:role_allowed) {
     FactoryGirl.create(:role,
-                       permissions: [:create_impediments, :create_tasks, :update_impediments, :update_tasks])
+                       permissions: [:add_work_packages, :manage_subtasks])
   }
   let(:role_forbidden) { FactoryGirl.create(:role) }
   # We need to create these as some view helpers access the database

spec/views/rb_taskboards/show_spec.rb

@@ -40,7 +40,7 @@ describe 'rb_taskboards/show', type: :view do
   let(:user2) { FactoryGirl.create(:user) }
   let(:role_allowed) {
     FactoryGirl.create(:role,
-                       permissions: [:create_impediments, :create_tasks, :update_impediments, :update_tasks])
+                       permissions: [:add_work_packages, :edit_work_packages, :manage_subtasks])
   }
   let(:role_forbidden) { FactoryGirl.create(:role) }
   # We need to create these as some view helpers access the database