rschneider/fitness-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

detsta import improvements, procurement changes

Browse Source
This commit is contained in:
Roland Schneider
2016-02-26 21:19:51 +01:00
parent 6efbfa7d9b
commit 75aeb64b19
8 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/controllers/ProcurementController.php
View File

@@ -13,6 +13,7 @@ use common\models\Product;
use common\models\User;
use common\components\Helper;
use common\models\Account;
use yii\helpers\Url;
/**
* ProcurementController implements the CRUD actions for Procurement model.
@@ -193,7 +194,15 @@ class ProcurementController extends \backend\controllers\BackendController
}
return $this->redirect(['view', 'id' => $model->id_procurement]);
// return $this->redirect(['view', 'id' => $model->id_procurement]);
$url = Url::previous("product_index");
if ( isset($url)){
return $this->redirect( $url );
}else{
return $this->redirect(['product/index']);
}
// return $this->redirect(Yii::$app->request->referrer);
} else {
return $this->render('create_product', [
'model' => $model,

3
backend/controllers/ProductController.php
View File

@@ -12,6 +12,7 @@ use common\models\Account;
use common\models\ProductCategory;
use backend\models\ProductStatisticsSearch;
use PHPExcel;
use yii\helpers\Url;
/**
* ProductController implements the CRUD actions for Product model.
@@ -47,6 +48,8 @@ class ProductController extends \backend\controllers\BackendController
$searchModel = new ProductSearch();
$dataProvider = $searchModel->search(Yii::$app->request->queryParams);
Url::remember(Url::current(),"product_index");
return $this->render('index', [
'searchModel' => $searchModel,
'dataProvider' => $dataProvider,