Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Product->Setting Language item modification.

Browse Source
This commit is contained in:
songchenxuan
2021-11-15 09:42:16 +08:00
parent 9ae77a2765
commit c2d3d4a24b
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/control.php
+1 -1
View File
@@ -43,7 +43,7 @@ class branch extends control
$this->view->browseType = $browseType;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->product = $this->loadModel('product')->getById($productID);
$this->view->product = $this->product->getById($productID);
$this->display();
}
module/branch/lang/en.php
+2 -2
View File
@@ -15,7 +15,7 @@ $lang->branch->activate = 'Activate';
$lang->branch->activateAction = 'Activate Branch';
$lang->branch->close = 'Close';
$lang->branch->closeAction = 'Close Branch';
$lang->branch->create = 'Create Branch';
$lang->branch->create = 'Create %s';
$lang->branch->merge = 'Merge';
$lang->branch->batchEdit = 'Batch Edit';
$lang->branch->defaultBranch = 'Default Branch';
@@ -43,7 +43,7 @@ $lang->branch->confirmActivate = 'Do you want to activate this @branch@？';
$lang->branch->existName = '@branch@ name already exists.';
$lang->branch->noData = 'No branches.';
$lang->branch->mainBranch = 'The default main branch of the product.';
$lang->branch->mainBranch = 'The default main %s of the product.';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = 'Active';
module/branch/model.php
+1 -1
View File
@@ -55,9 +55,9 @@ class branchModel extends model
->page($pager)
->fetchAll('id');
$product = $this->loadModel('product')->getById($productID);
if($browseType == 'closed') return $branchList;
$product = $this->loadModel('product')->getById($productID);
$defaultBranch = BRANCH_MAIN;
foreach($branchList as $branch) $defaultBranch = $branch->default ? $branch->id : $defaultBranch;