Show a popup listing available editors when hovering over the edit tab

[rails.git] / app / helpers / application_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ca26cfd4846aa59dfd258164146372302daf7afc..c24e7ff5be26b7a504c620ede19ea95d66ba30b5 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -120,7 +120,9 @@ module ApplicationHelper
   end
 
   def preferred_editor
   end
 
   def preferred_editor

-    if @user and @user.preferred_editor
+    if params[:editor]
+      params[:editor]
+    elsif @user and @user.preferred_editor

       @user.preferred_editor
     else
       DEFAULT_EDITOR
       @user.preferred_editor
     else
       DEFAULT_EDITOR