rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00
Code Issues Releases Activity

(feat) save latest product filter when click back button

Browse Source
This commit is contained in:
Du Peng 2022-10-20 19:12:24 +02:00
parent 2f676d1a89
commit b1135f6df0
10 changed files with 48 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/frontend/src/javascript/controllers/admin/orders.js
View File

@ -26,9 +26,9 @@ Application.Controllers.controller('AdminShowOrdersController', ['$rootScope', '
};
/**
* Click Callback triggered in case of back products list
* Click Callback triggered in case of back orders list
*/
$scope.backProductsList = () => {
$scope.backOrdersList = () => {
$state.go('app.admin.store.orders');
};

9
app/frontend/src/javascript/controllers/admin/store_products.js
View File

@ -29,8 +29,13 @@ Application.Controllers.controller('AdminStoreProductController', ['$scope', 'CS
/**
* Click Callback triggered in case of back products list
*/
$scope.backProductsList = () => {
$state.go('app.admin.store.products');
$scope.backProductsList = (event) => {
event.preventDefault();
event.stopPropagation();
if ($state.prevState === '') {
$state.prevState = 'app.admin.store.products';
}
window.history.back();
};
/* PRIVATE SCOPE */

17
app/frontend/src/javascript/controllers/cart.js
View File

@ -4,8 +4,8 @@
*/
'use strict';
Application.Controllers.controller('CartController', ['$scope', 'CSRF', 'growl',
function ($scope, CSRF, growl) {
Application.Controllers.controller('CartController', ['$scope', 'CSRF', 'growl', '$state',
function ($scope, CSRF, growl, $state) {
/* PRIVATE SCOPE */
/* PUBLIC SCOPE */
@ -22,6 +22,19 @@ Application.Controllers.controller('CartController', ['$scope', 'CSRF', 'growl',
}, 50);
};
/**
* Overlap global function to allow the user to navigate to the previous screen
* If no previous $state were recorded, navigate to the project list page
*/
$scope.backPrevLocation = function (event) {
event.preventDefault();
event.stopPropagation();
if ($state.prevState === '') {
$state.prevState = 'app.public.store';
}
window.history.back();
};
/**
* Callback triggered in case of error
*/

4
app/frontend/src/javascript/controllers/orders.js
View File

@ -26,9 +26,9 @@ Application.Controllers.controller('ShowOrdersController', ['$rootScope', '$scop
};
/**
* Click Callback triggered in case of back products list
* Click Callback triggered in case of back orders list
*/
$scope.backProductsList = () => {
$scope.backOrdersList = () => {
$state.go('app.logged.dashboard.orders');
};

17
app/frontend/src/javascript/controllers/products.js
View File

@ -4,13 +4,26 @@
*/
'use strict';
Application.Controllers.controller('ShowProductController', ['$scope', 'CSRF', 'growl', '$transition$',
function ($scope, CSRF, growl, $transition$) {
Application.Controllers.controller('ShowProductController', ['$scope', 'CSRF', 'growl', '$transition$', '$state',
function ($scope, CSRF, growl, $transition$, $state) {
/* PRIVATE SCOPE */
/* PUBLIC SCOPE */
$scope.productSlug = $transition$.params().slug;
/**
* Overlap global function to allow the user to navigate to the previous screen
* If no previous $state were recorded, navigate to the project list page
*/
$scope.backPrevLocation = function (event) {
event.preventDefault();
event.stopPropagation();
if ($state.prevState === '') {
$state.prevState = 'app.public.store';
}
window.history.back();
};
/**
* Callback triggered in case of error
*/

2
app/frontend/templates/admin/orders/show.html
View File

@ -10,7 +10,7 @@
<section>
<div class="show-order-nav">
<a class="back-btn" ng-click="backProductsList()" tabindex="0">
<a class="back-btn" ng-click="backOrdersList()" tabindex="0">
<i class="fas fa-angle-left"></i>
<span translate>{{ 'app.admin.store.back_to_list' }}</span>
</a>

4
app/frontend/templates/admin/store/product_edit.html
View File

@ -1,6 +1,6 @@
<div class="header-page">
<div class="back">
<a ng-click="backPrevLocation($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
<a ng-click="backProductsList($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
</div>
<div class="center">
@ -10,7 +10,7 @@
<section class="admin-store-manage">
<div class="edit-product-nav">
<a class="back-btn" ng-click="backProductsList()">
<a class="back-btn" ng-click="backProductsList($event)">
<i class="fas fa-angle-left"></i>
<span translate>{{ 'app.admin.store.back_to_list' }}</span>
</a>

4
app/frontend/templates/admin/store/product_new.html
View File

@ -1,6 +1,6 @@
<div class="header-page">
<div class="back">
<a ng-click="backPrevLocation($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
<a ng-click="backProductsList($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
</div>
<div class="center">
@ -10,7 +10,7 @@
<section>
<div class="new-product-nav">
<a class="back-btn" ng-click="backProductsList()" tabindex="0">
<a class="back-btn" ng-click="backProductsList($event)" tabindex="0">
<i class="fas fa-angle-left"></i>
<span translate>{{ 'app.admin.store.back_to_list' }}</span>
</a>

2
app/frontend/templates/cart/index.html
View File

@ -1,6 +1,6 @@
<div class="header-page">
<div class="back">
<a ui-sref="app.public.store"><i class="fas fa-long-arrow-alt-left "></i></a>
<a ng-click="backPrevLocation($event)"><i class="fas fa-long-arrow-alt-left "></i></a>
</div>
<div class="center">

2
app/frontend/templates/orders/show.html
View File

@ -7,7 +7,7 @@
<section>
<div class="show-order-nav">
<a class="back-btn" ng-click="backProductsList()" tabindex="0">
<a class="back-btn" ng-click="backOrdersList()" tabindex="0">
<i class="fas fa-angle-left"></i>
<span translate>{{ 'app.shared.store.show_order.back_to_list' }}</span>
</a>