Avoid an AJAX query if the watchers form is already loaded.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8593 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 1a1935d0dc2bc7b7a2565f691612234a3660d911..8a4ce52868f859e55ffa19ae475da225155dc6ff 100644 (file)
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -42,6 +42,7 @@ class WatchersController < ApplicationController
         render :update do |page|
           page.replace_html 'ajax-modal', :partial => 'watchers/new', :locals => {:watched => @watched}
           page << "showModal('ajax-modal', '400px');"
+          page << "$('ajax-modal').addClassName('new-watcher');"
         end
       end
     end

diff --git a/app/views/watchers/_watchers.html.erb b/app/views/watchers/_watchers.html.erb
index 1f40707beb620bcdb06c2cd8b3fd9926738a8c52..29cf7539bda9a34ef80701606927021620944962 100644 (file)
--- a/app/views/watchers/_watchers.html.erb
+++ b/app/views/watchers/_watchers.html.erb
@@ -5,7 +5,8 @@
                             :action => 'new',
                             :object_type => watched.class.name.underscore,
                             :object_id => watched},
-                   :method => 'get' %>
+                   :method => 'get',
+                   :before => "if ($('ajax-modal').hasClassName('new-watcher')) {showModal('ajax-modal'); return false;}" %>
 </div>
 <% end %>