Replaces 'remote_form_for' by 'form_for'

app/views/watchers/_watchers.html.erb

@@ -27,26 +27,23 @@ See doc/COPYRIGHT.rdoc for more details.
 
 ++#%>
 
+<% user_allowed_to_add_watchers = User.current.allowed_to?(:add_work_package_watchers, @project) %>
+
 <strong><%= l(:label_work_package_watchers) %> (<%= watched.watcher_users.size %>)</strong>
-<%= "(#{link_to(l(:button_add_watcher), new_watcher_path(:object_type => watched.class.name.underscore.pluralize,
-                                                         :object_id => watched),
-                                        :method => :get,
-                                        :remote => true
-               )})".html_safe if User.current.allowed_to?(:add_work_package_watchers, @project)
-%>
-<% unless @watcher.nil? %>
-	<%= remote_form_for(:watcher, @watcher,
-                     :url => {:controller => '/watchers',
-                              :action => 'create',
-                              :object_type => watched.class.name.underscore.pluralize,
-         	                    :object_id => watched},
-       	             :method => :post,
-      	             :html => {:id => 'new-watcher-form'}) do |f| %>
-		<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
-
-		<%= submit_tag l(:button_add) %>
-		<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
-	<% end %>
+<% if user_allowed_to_add_watchers %>
+  - <%= toggle_link l(:button_add_watcher), 'new-watcher-form', {:focus => 'watcher_user_id'} %>
+<% end %>
+
+<%= form_for(:watcher,
+             url: watchers_path(watched.class.name.underscore.pluralize, watched),
+             method: :post,
+             remote: true,
+             complete: "Form.Element.focus('watcher_user_id');",
+             html: { id: 'new-watcher-form', style: (@watcher ? '' : 'display:none;') }) do |f| %>
+  <p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => "--- #{l(:actionview_instancetag_blank_option)} ---" %>
+
+  <%= submit_tag l(:button_add) %>
+  <%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
 <% end %>
 
 <%= watchers_list(watched) %>