From: Toshi MARUYAMA Date: Sun, 29 Apr 2012 02:43:42 +0000 (+0000) Subject: view: remote_form_for: equals sign mandatory to print blocks and replace to form_for... X-Git-Tag: 2.0.0~107 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4b2fc90431a6011ec0c7ce5318bb98c6133f91b8;p=redmine.git view: remote_form_for: equals sign mandatory to print blocks and replace to form_for and use :remote => true and :as git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9571 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/views/issues/_relations.html.erb b/app/views/issues/_relations.html.erb index 8eedf40d8..0b503fc6c 100644 --- a/app/views/issues/_relations.html.erb +++ b/app/views/issues/_relations.html.erb @@ -32,10 +32,12 @@ <% end %> -<% remote_form_for(:relation, @relation, +<%= form_for @relation, { + :as => :relation, :remote => true, :url => {:controller => 'issue_relations', :action => 'create', :issue_id => @issue}, :method => :post, :complete => "Form.Element.focus('relation_issue_to_id');", - :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')}) do |f| %> + :html => {:id => 'new-relation-form', :style => (@relation ? '' : 'display: none;')} + } do |f| %> <%= render :partial => 'issue_relations/form', :locals => {:f => f}%> <% end %> diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index b5086d836..6bb07c69a 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -18,9 +18,10 @@ <%= link_to_user member.principal %> <%=h member.roles.sort.collect(&:to_s).join(', ') %> - <% remote_form_for(:membership, member, :url => membership_path(member), + <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), :method => :put, - :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }) do |f| %> + :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }} + ) do |f| %>

<% roles.each do |role| %>
@@ -59,9 +60,11 @@

<% if roles.any? && principals.any? %> - <% remote_form_for(:membership, @member, :url => project_memberships_path(@project), :method => :post, + <%= form_for(@member, {:as => :membership, :remote => true, + :url => project_memberships_path(@project), :method => :post, :loading => '$(\'member-add-submit\').disable();', - :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();') do |f| %> + :complete => 'if($(\'member-add-submit\')) $(\'member-add-submit\').enable();' + } ) do |f| %>
<%=l(:label_member_new)%>

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

diff --git a/app/views/repositories/_related_issues.html.erb b/app/views/repositories/_related_issues.html.erb index f1bb70320..a7aee5d39 100644 --- a/app/views/repositories/_related_issues.html.erb +++ b/app/views/repositories/_related_issues.html.erb @@ -24,7 +24,7 @@ <% if manage_allowed %> - <% remote_form_for(:issue, @issue, + <%= form_for(@issue, :as => :issue, :remote => true, :url => {:controller => 'repositories', :action => 'add_related_issue', :id => @project, :repository_id => @repository.identifier_param, :rev => @changeset.identifier},