From 56204d4ea61177333b092e071e06f27a7f5f5765 Mon Sep 17 00:00:00 2001 From: Rob H Date: Thu, 1 May 2014 13:01:52 +1000 Subject: [PATCH] Upgrade Admin AngularJS --- app/assets/javascripts/admin/all.js | 4 ++-- .../admin/bulk_order_management.js.coffee | 1 + .../javascripts/admin/bulk_product_update.js.coffee | 1 + .../spree/admin/orders/bulk_management.html.haml | 4 ++-- app/views/spree/admin/products/bulk_edit.html.haml | 12 ++++++------ 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/admin/all.js b/app/assets/javascripts/admin/all.js index 6e569ed67b..4cce0bdcea 100644 --- a/app/assets/javascripts/admin/all.js +++ b/app/assets/javascripts/admin/all.js @@ -9,8 +9,8 @@ //= require jquery_ujs //= require jquery-ui //= require shared/jquery-ui-timepicker-addon -//= require shared/angular -//= require shared/angular-resource +//= require angular +//= require angular-resource //= require admin/spree_core //= require admin/spree_auth //= require admin/spree_promo diff --git a/app/assets/javascripts/admin/bulk_order_management.js.coffee b/app/assets/javascripts/admin/bulk_order_management.js.coffee index 4a56587dfe..1056f72681 100644 --- a/app/assets/javascripts/admin/bulk_order_management.js.coffee +++ b/app/assets/javascripts/admin/bulk_order_management.js.coffee @@ -4,6 +4,7 @@ orderManagementModule.config [ "$httpProvider" (provider) -> provider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content") + provider.defaults.headers.common["Accept"] = "application/json" ] orderManagementModule.value "blankOption", -> diff --git a/app/assets/javascripts/admin/bulk_product_update.js.coffee b/app/assets/javascripts/admin/bulk_product_update.js.coffee index c2641615e2..126c0d93dd 100644 --- a/app/assets/javascripts/admin/bulk_product_update.js.coffee +++ b/app/assets/javascripts/admin/bulk_product_update.js.coffee @@ -4,6 +4,7 @@ productEditModule.config [ "$httpProvider" (provider) -> provider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content") + provider.defaults.headers.common["Accept"] = "application/json" ] diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 55b9bd79fb..28fd7b3aea 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -44,7 +44,7 @@ %h6{ :class => "eight columns alpha", 'ng-hide' => 'sharedResource', style: 'text-align: center;' } {{ selectedUnitsVariant.unit_text }} %div{ :class => "four columns omega" } %h6{ :class => "four columns alpha", :style => 'text-align: right;' } - %a{ 'ng-click' => 'selectedUnitsVariant = {};selectedUnitsProduct = {};sharedResource=false;' } Clear + %a{ :href => '#', 'ng-click' => 'selectedUnitsVariant = {};selectedUnitsProduct = {};sharedResource=false;' } Clear %hr .row .one.column.alpha   @@ -138,7 +138,7 @@ %td.order_cycle{ 'ng-show' => 'columns.order_cycle.visible' } {{ line_item.order.order_cycle.name }} %td.hub{ 'ng-show' => 'columns.hub.visible' } {{ line_item.order.distributor.name }} %td.variant{ 'ng-show' => 'columns.variant.visible' } - %a{ 'ng-click' => "setSelectedUnitsVariant(line_item.units_product,line_item.units_variant)" } {{ line_item.units_variant.unit_text }} + %a{ :href => '#', 'ng-click' => "setSelectedUnitsVariant(line_item.units_product,line_item.units_variant)" } {{ line_item.units_variant.unit_text }} %td.quantity{ 'ng-show' => 'columns.quantity.visible' } %input{ :type => 'number', :name => 'quantity', 'ng-model' => "line_item.quantity", 'ofn-line-item-upd-attr' => "quantity" } %td.max{ 'ng-show' => 'columns.max.visible' } {{ line_item.max_quantity }} diff --git a/app/views/spree/admin/products/bulk_edit.html.haml b/app/views/spree/admin/products/bulk_edit.html.haml index cedcc5df60..d35a1a7742 100644 --- a/app/views/spree/admin/products/bulk_edit.html.haml +++ b/app/views/spree/admin/products/bulk_edit.html.haml @@ -45,7 +45,7 @@ %div{ :class => "six columns omega" } {{ filter.value }} %div{ :class => "two columns omega" } - %a{ 'ng-click' => "removeFilter(filter)" } Remove Filter + %a{ :href => "#", 'ng-click' => "removeFilter(filter)" } Remove Filter %div.column_toggle{ :class => "sixteen columns alpha", "ng-show" => 'optionTabs.column_toggle.visible' } %ul.column-list{ :class => "sixteen columns alpha" } %li.column-list-item{ :class => "three columns alpha", 'ofn-toggle-column' => 'column', 'ng-repeat' => 'column in columns' } @@ -63,22 +63,22 @@ %div.pagination{ :class => "seven columns omega" } %div.pagenav{ :class => "two columns alpha" } %span.first - %a{ 'ng-click' => "currentPage = 1", 'ng-show' => "currentPage > 1" } + %a{ :href => "#", 'ng-click' => "currentPage = 1", 'ng-show' => "currentPage > 1" } « First %span.prev - %a{ 'ng-click' => "currentPage = currentPage - 1", 'ng-show' => "currentPage > 1" } + %a{ :href => "#", 'ng-click' => "currentPage = currentPage - 1", 'ng-show' => "currentPage > 1" } ‹ Prev %div.pagenav{ :class => "columns omega" } %span.page{ 'ng-repeat' => "page in [] | rangeArray:minPage():maxPage()", 'ng-class' => "{current: currentPage==page}" } - %a{ 'ng-click' => "setPage(page)" } + %a{ :href => "#", 'ng-click' => "setPage(page)" } {{page}} %span{ 'ng-show' => "maxPage() < totalPages()" } ... %div.pagenav{ :class => "two columns omega" } %span.next - %a{ 'ng-click' => "currentPage = currentPage + 1", 'ng-show' => "currentPage < totalPages()" } + %a{ :href => "#", 'ng-click' => "currentPage = currentPage + 1", 'ng-show' => "currentPage < totalPages()" } Next › %span.last - %a{ 'ng-click' => "currentPage = totalPages()", 'ng-show' => "currentPage < totalPages()" } + %a{ :href => "#", 'ng-click' => "currentPage = totalPages()", 'ng-show' => "currentPage < totalPages()" } Last » %div.pagination_info{ :class => 'four columns alpha' } Show