Merge pull request linuxfrorg#293 from Trim/maintainer

Create a maintainer role to manage trackers

Author: Oumph

app/controllers/admin/maintainers_controller.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+class Admin::MaintainersController < AdminController
+  before_action :load_account
+
+  def create
+    @account.give_maintainer_rights!
+    Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a reçu le rôle mainteneur par #{current_user.name} #{user_url(current_user)}")
+    redirect_to @account.user, notice: "Nouveau rôle : mainteneur"
+  end
+
+  def destroy
+    @account.remove_all_rights!
+    Board.amr_notification("Le compte #{@account.login} #{user_url @account.login} a perdu le rôle mainteneur par #{current_user.name} #{user_url(current_user)}")
+    redirect_to @account.user, notice: "Rôle retiré : mainteneur"
+  end
+
+protected
+
+  def load_account
+    @account = Account.find(params[:account_id])
+  end
+
+end

app/controllers/trackers_controller.rb

@@ -88,7 +88,7 @@ def destroy
 protected
 
   def tracker_params
-    if current_account.try(:admin?)
+    if current_account.try(:tracker_admin?)
       params.require(:tracker).permit!
     else
       params.require(:tracker).permit(:title, :wiki_body, :category_id, :state)

app/helpers/static_helper.rb

@@ -26,6 +26,10 @@ def helper_moderator_list
     people_list Account.moderator
   end
 
+  def helper_maintainer_list
+    people_list Account.maintainer
+  end
+
   def helper_friend_sites_list
     sites = FriendSite.all.map { |s| content_tag(:li, link_to(s.title, s.url)) }
     content_tag(:ul, safe_join(sites), class: "people-list")

app/models/account.rb

@@ -39,6 +39,7 @@
 # There are several levels of users:
 #   * anonymous     -> they have no account and can only read public contents
 #   * authenticated -> they can read public contents and submit new ones
+#   * maintainer    -> they can manage the tracker system
 #   * moderator     -> they make the order and the security ruling
 #   * editor        -> they edit the news in the redaction space
 #   * admin         -> the almighty users
@@ -127,6 +128,8 @@ def update_with_password(params={}, *options)
 ### Role ###
 
   scope :active,    -> { where("role != 'inactive'") }
+  scope :maintainer, -> { where(role: "maintainer") }
+  scope :tracker_admin, -> { where(role: %w[admin maintainer]) }
   scope :moderator, -> { where(role: "moderator") }
   scope :editor,    -> { where(role: "editor") }
   scope :admin,     -> { where(role: "admin") }
@@ -136,6 +139,7 @@ def update_with_password(params={}, *options)
     event :inactivate            do transition all             => :inactive  end
     event :reactivate            do transition :inactive       => :visitor   end
     event :remove_all_rights     do transition all - :inactive => :visitor   end
+    event :give_maintainer_rights do transition all - :inactive => :maintainer end
     event :give_moderator_rights do transition all - :inactive => :moderator end
     event :give_editor_rights    do transition all - :inactive => :editor    end
     event :give_admin_rights     do transition all - :inactive => :admin     end
@@ -145,6 +149,7 @@ def update_with_password(params={}, *options)
   def display_role(hasContents)
     case role
     when 'visitor' then hasContents ? 'contributeur' : 'visiteur'
+    when 'maintainer' then 'mainteneur'
     when 'editor' then 'animateur'
     when 'moderator' then 'modérateur'
     when 'admin' then 'admin'
@@ -158,6 +163,11 @@ def log_role
     logs.create(description: "Changement de rôle : #{roles.join ' → '}", user_id: amr_id)
   end
 
+  # A tracker admin can update, assign and delete a node of the tracker
+  def tracker_admin?
+    admin? || maintainer?
+  end
+
   # An AMR is someone who is either an admin or a moderator
   def amr?
     admin? || moderator?

app/models/tracker.rb

@@ -75,11 +75,11 @@ def assigned_to
 ### ACL ###
 
   def updatable_by?(account)
-    account.moderator? || account.admin? || account.user_id == node.user_id
+    account.maintainer? || account.moderator? || account.admin? || account.user_id == node.user_id
   end
 
   def destroyable_by?(account)
-    account.moderator? || account.admin?
+    account.maintainer? || account.moderator? || account.admin?
   end
 
   def too_old_for_comments?

app/views/admin/accounts/index.html.haml

@@ -72,11 +72,14 @@
       %td
         - if account.editor?
           = button_to "Simple visiteur", admin_account_editor_path(account.id), method: :delete, class: "change_role"
+        - if account.maintainer?
+          = button_to "Simple visiteur", admin_account_maintainer_path(account.id), method: :delete, class: "change_role"
         - elsif account.moderator?
           = button_to "Simple visiteur", admin_account_moderator_path(account.id), method: :delete, class: "change_role"
         - elsif account.admin?
           = button_to "Simple visiteur", admin_account_admin_path(account.id), method: :delete, class: "change_role"
         - elsif !account.inactive?
+          = button_to "Mainteneur", admin_account_maintainer_path(account.id), class: "change_role"
           = button_to "Modérateur", admin_account_moderator_path(account.id), class: "change_role"
           = button_to "Animateur", admin_account_editor_path(account.id), class: "change_role"
           = button_to "Admin", admin_account_admin_path(account.id), class: "change_role"

app/views/statistics/tracker.html.haml

@@ -36,7 +36,7 @@
 
     - if @stats.good_workers.any?
       - maxval = @stats.good_workers.map {|a| a["cnt"] }.max
-      %h2#nbfermees Nombre d’entrées fermées par les administrateurs
+      %h2#nbfermees Nombre d’entrées fermées par les mainteneurs et administrateurs
       %table
         %tr
           %th Personne

app/views/trackers/_form.html.haml

@@ -17,9 +17,10 @@
   %p
     = form.label :state, "État"
     = form.select :state, Tracker::States.invert
-  %p
-    = form.label :assigned_to_user_id, "Assigné à"
-    = form.collection_select :assigned_to_user_id, Account.admin, :user_id, :login, include_blank: true
+  - if current_account.tracker_admin?
+    %p
+      = form.label :assigned_to_user_id, "Assigné à"
+      = form.collection_select :assigned_to_user_id, Account.tracker_admin, :user_id, :login, include_blank: true
 %p
   = form.submit "Prévisualiser", id: "tracker_preview"
   = form.submit "Soumettre", 'data-disable-with' => "Enregistrement en cours" if @preview_mode || @tracker.persisted?

app/views/trackers/_tracker.html.haml

@@ -4,5 +4,7 @@
     %span.tracker_id ##{tracker.id}
     = posted_by(tracker)
     État de l’entrée : #{tracker.state_name}.
+    - if tracker.assigned_to_user_id?
+      Assigné à #{tracker.assigned_to}.
   - if current_account && current_account.can_update?(tracker)
     - c.actions = link_to("Modifier", "/suivi/#{tracker.to_param}/modifier", class: 'action')

app/views/trackers/index.html.haml

@@ -22,7 +22,7 @@
     = f.collection_select :category_id, Category.all, :id, :title, include_blank: true
   %p
     = f.label :assigned_to_user_id, "Assigné à : "
-    = f.collection_select :assigned_to_user_id, Account.admin, :user_id, :name, include_blank: true
+    = f.collection_select :assigned_to_user_id, Account.tracker_admin, :user_id, :name, include_blank: true
   %p
     = label_tag :order, "Trier par : "
     = select_tag :order, options_for_select({ "Date d’ouverture" => "created_at", "Note" => "score", "Nombre de commentaires" => "comments_count", "Dernier commentaire" => "last_commented_at" }, @order)