Skip to content

Commit

Permalink
Fix form button links, use already existing partial
Browse files Browse the repository at this point in the history
Conflicts:
	backend/app/views/spree/admin/payment_methods/edit.html.erb
	backend/app/views/spree/admin/payment_methods/new.html.erb
  • Loading branch information
tanmay3011 authored and Mafi88 committed Mar 14, 2016
1 parent 78b35fc commit b8cb2e5
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
10 changes: 4 additions & 6 deletions backend/app/views/spree/admin/payment_methods/edit.html.erb
Expand Up @@ -2,13 +2,11 @@
<%= Spree.t(:editing_resource, resource: Spree::PaymentMethod.model_name.human) %> / <%= @payment_method.name %>
<% end %>
<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @payment_method } %>
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method) do |f| %>
<%= form_for @payment_method, url: admin_payment_method_path(@payment_method) do |f| %>
<fieldset>
<%= render :partial => 'form', :locals => { :f => f } %>
<div data-hook="buttons" class="actions">
<%= button Spree.t('actions.update'), 'save' %>
</div>
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/edit_resource_links' %>
</fieldset>
<% end %>
10 changes: 4 additions & 6 deletions backend/app/views/spree/admin/payment_methods/new.html.erb
Expand Up @@ -2,13 +2,11 @@
<%= Spree.t(:new_payment_method) %>
<% end %>
<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @payment_method } %>
<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
<%= form_for @payment_method, :url => collection_url do |f| %>
<%= form_for @payment_method, url: collection_url do |f| %>
<fieldset>
<%= render :partial => 'form', :locals => { :f => f } %>
<div data-hook="buttons" class="actions">
<%= button Spree.t(:create), 'save' %>
</div>
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/new_resource_links' %>
</fieldset>
<% end %>
6 changes: 2 additions & 4 deletions backend/app/views/spree/admin/taxonomies/new.html.erb
Expand Up @@ -4,9 +4,7 @@
<%= form_for [:admin, @taxonomy] do |f| %>
<fieldset>
<%= render :partial => 'form', :locals => { :f => f } %>
<div class="form-actions" data-hook="buttons">
<%= button Spree.t(:create), 'save' %>
</div>
<%= render partial: 'form', locals: { f: f } %>
<%= render partial: 'spree/admin/shared/new_resource_links' %>
</fieldset>
<% end %>

0 comments on commit b8cb2e5

Please sign in to comment.