Fix editor rights

linuxfrorg · May 29, 2013 · cb33436 · cb33436
1 parent 7c9720a
commit cb33436
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/app/controllers/moderation/news_controller.rb b/app/controllers/moderation/news_controller.rb
@@ -72,12 +72,6 @@ def refuse
     end
   end
 
-  def reassign
-    enforce_reassign_permission(@news)
-    @news.reassign_to params[:user_id]
-    redirect_to [:moderation, @news], :notice => "L'auteur initial de la dépêche a été changé"
-  end
-
   def rewrite
     enforce_rewrite_permission(@news)
     if @news.unlocked?

diff --git a/app/controllers/redaction/news_controller.rb b/app/controllers/redaction/news_controller.rb
@@ -44,6 +44,12 @@ def update
     render :partial => 'short'
   end
 
+  def reassign
+    enforce_reassign_permission(@news)
+    @news.reassign_to params[:user_id]
+    redirect_to [:redaction, @news], :notice => "L'auteur initial de la dépêche a été changé"
+  end
+
   def reorganize
     if @news.lock_by(current_user)
       @news.put_paragraphs_together

diff --git a/app/views/redaction/news/_attendees.html.haml b/app/views/redaction/news/_attendees.html.haml
@@ -5,8 +5,8 @@
     = list_of(attendees) do |a|
       = link_to a.name, a, :title => pluralize(a.nb_editions, "édition")
       - if current_account.can_reassign?(@news)
-        = button_to "Réattribuer", reassign_moderation_news_path(:user_id => a.id), :class => "reassign_news", :title => "Réattribuer la paternité de cette dépêche"
+        = button_to "Réattribuer", reassign_redaction_news_path(:user_id => a.id), :class => "reassign_news", :title => "Réattribuer la paternité de cette dépêche"
     - if current_account.can_reassign?(@news)
       %li
         Collectif
-        = button_to "Réattribuer", reassign_moderation_news_path(:user_id => User.collective.id), :class => "reassign_news", :title => "Réattribuer la paternité de cette dépêche"
+        = button_to "Réattribuer", reassign_redaction_news_path(:user_id => User.collective.id), :class => "reassign_news", :title => "Réattribuer la paternité de cette dépêche"
diff --git a/app/views/redaction/news/show.html.haml b/app/views/redaction/news/show.html.haml
@@ -28,7 +28,7 @@
       = button_to "Ajouter un paragraphe", redaction_news_paragraphs_path(:news_id => @news), :remote => true, :class => "add_para"
 
 = link_to "Réorganiser", reorganize_redaction_news_path(@news), :class => "reorganize"
-- if current_account.amr? || @news.submitted_by?(current_account)
+- if current_account.amr? || current_account.editor? || @news.submitted_by?(current_account)
   = button_to "Soumettre la dépêche", submit_redaction_news_path(@news), :class => "submit_news"
 - if current_account.can_followup? @news
   %button#followup Relancer les rédacteurs

diff --git a/config/routes.rb b/config/routes.rb
@@ -116,6 +116,7 @@
         get "/revisions/:revision" => :revision, :as => :revision
         post :submit
         post :followup
+        post :reassign
         get :reorganize
         put :reorganized
       end
@@ -138,7 +139,6 @@
         post :accept
         post :refuse
         post :rewrite
-        post :reassign
         post :reset
         post :ppp
         get :vote