Skip to content

Commit

Permalink
Merge pull request #6736 from jibees/6707-remove-anchor-jump
Browse files Browse the repository at this point in the history
Remove anchor in URL so avoid browser scrolling to the top of the page when editing order
  • Loading branch information
sauloperez authored Jan 28, 2021
2 parents abe2cb9 + 686dcaa commit 0a1d487
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions app/views/spree/admin/orders/_shipment.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,8 @@

%td.actions
- if can? :update, shipment
= link_to '', '#', :class => 'save-method icon_link icon-ok no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'save' }, title: I18n.t('actions.save')
= link_to '', '#', :class => 'cancel-method icon_link icon-cancel no-text with-tip', :data => { :action => 'cancel' }, :title => I18n.t('actions.cancel')

= link_to '', '', :class => 'save-method icon_link icon-ok no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'save' }, title: I18n.t('actions.save')
= link_to '', '', :class => 'cancel-method icon_link icon-cancel no-text with-tip', :data => { :action => 'cancel' }, :title => I18n.t('actions.cancel')
%tr.show-method.total
%td{ :colspan => "4" }
- if shipment.adjustment.present?
Expand All @@ -73,7 +72,7 @@
- if shipment.adjustment.present? && !shipment.shipped?
%td.actions
- if can? :update, shipment
= link_to '', '#', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')
= link_to '', '', :class => 'edit-method icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')

%tr.edit-tracking.hidden.total
%td{ :colspan => "5" }
Expand All @@ -83,8 +82,8 @@

%td.actions
- if can? :update, shipment
= link_to '', '#', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'save' }, :title => I18n.t('actions.save')
= link_to '', '#', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => { :action => 'cancel' }, :title => I18n.t('actions.cancel')
= link_to '', '', :class => 'save-tracking icon_link icon-ok no-text with-tip', :data => { 'shipment-number' => shipment.number, :action => 'save' }, :title => I18n.t('actions.save')
= link_to '', '', :class => 'cancel-tracking icon_link icon-cancel no-text with-tip', :data => { :action => 'cancel' }, :title => I18n.t('actions.cancel')

%tr.show-tracking.total
%td{ :colspan => "5" }
Expand All @@ -97,4 +96,4 @@

%td.actions
- if can? :update, shipment
= link_to '', '#', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')
= link_to '', '', :class => 'edit-tracking icon_link icon-edit no-text with-tip', :data => { :action => 'edit' }, :title => Spree.t('edit')

0 comments on commit 0a1d487

Please sign in to comment.