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

* Code for task#43919. Add lang and main default.

Browse Source
This commit is contained in:
xieqiyu
2021-11-05 13:48:09 +08:00
parent d74ce66445
commit 8b7616a626
8 changed files with 146 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/lang/de.php
+23 -5
View File
@@ -8,12 +8,30 @@ $lang->branch->add = 'Hinzufügen';
$lang->branch->manageTitle = '%s Management';
$lang->branch->all = 'Alle ';
$lang->branch->id = 'ID';
$lang->branch->product = 'Produkt';
$lang->branch->name = 'Name';
$lang->branch->order = 'Sortierung';
$lang->branch->deleted = 'Löscht';
$lang->branch->create = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->id = 'ID';
$lang->branch->product = 'Produkt';
$lang->branch->name = 'Name';
$lang->branch->status = 'Status';
$lang->branch->createdDate = 'Created Date';
$lang->branch->closedDate = 'Closed Date';
$lang->branch->desc = 'Desc';
$lang->branch->order = 'Sortierung';
$lang->branch->deleted = 'Löscht';
$lang->branch->confirmDelete = 'Möchten Sie diesen @branch@ löschen?';
$lang->branch->canNotDelete = 'Es sind Daten im @branch@ vorhanden. Löschen nicht möglich.';
$lang->branch->nameNotEmpty = 'Name must not be empty！';
$lang->branch->noData = 'No branches.';
$lang->branch->mainBranch = 'The default main branch of the product.';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = 'Active';
$lang->branch->statusList['closed'] = 'Closed';
$lang->branch->featureBar['manage']['all'] = 'All';
$lang->branch->featureBar['manage']['active'] = 'Active';
$lang->branch->featureBar['manage']['closed'] = 'Closed';
module/branch/lang/en.php
+23 -5
View File
@@ -8,12 +8,30 @@ $lang->branch->add = 'Add';
$lang->branch->manageTitle = '%s Management';
$lang->branch->all = 'All ';
$lang->branch->id = 'ID';
$lang->branch->product = 'Product';
$lang->branch->name = 'Name';
$lang->branch->order = 'Order';
$lang->branch->deleted = 'Delete';
$lang->branch->create = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->id = 'ID';
$lang->branch->product = 'Product';
$lang->branch->name = 'Name';
$lang->branch->status = 'Status';
$lang->branch->createdDate = 'Created Date';
$lang->branch->closedDate = 'Closed Date';
$lang->branch->desc = 'Desc';
$lang->branch->order = 'Order';
$lang->branch->deleted = 'Delete';
$lang->branch->confirmDelete = 'Do you want to delete this @branch@?';
$lang->branch->canNotDelete = 'There is data in @branch@. It cannot be deleted.';
$lang->branch->nameNotEmpty = 'Name must not be empty！';
$lang->branch->noData = 'No branches.';
$lang->branch->mainBranch = 'The default main branch of the product.';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = 'Active';
$lang->branch->statusList['closed'] = 'Closed';
$lang->branch->featureBar['manage']['all'] = 'All';
$lang->branch->featureBar['manage']['active'] = 'Active';
$lang->branch->featureBar['manage']['closed'] = 'Closed';
module/branch/lang/fr.php
+23 -5
View File
@@ -8,12 +8,30 @@ $lang->branch->add = 'Ajout';
$lang->branch->manageTitle = 'Gestion %s';
$lang->branch->all = 'Tous';
$lang->branch->id = 'ID';
$lang->branch->product = 'Product';
$lang->branch->name = 'Nom';
$lang->branch->order = 'Ordre';
$lang->branch->deleted = 'Delete';
$lang->branch->create = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->id = 'ID';
$lang->branch->product = 'Product';
$lang->branch->name = 'Nom';
$lang->branch->status = 'Status';
$lang->branch->createdDate = 'Created Date';
$lang->branch->closedDate = 'Closed Date';
$lang->branch->desc = 'Desc';
$lang->branch->order = 'Ordre';
$lang->branch->deleted = 'Delete';
$lang->branch->confirmDelete = "Voulez-vous vraiment supprimer l'établissement @branch@ ?";
$lang->branch->canNotDelete = 'Attention ! Il y a des données dans @branch@. Suppression impossible !';
$lang->branch->nameNotEmpty = 'Name must not be empty！';
$lang->branch->noData = 'No branches.';
$lang->branch->mainBranch = 'The default main branch of the product.';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = 'Active';
$lang->branch->statusList['closed'] = 'Closed';
$lang->branch->featureBar['manage']['all'] = 'All';
$lang->branch->featureBar['manage']['active'] = 'Active';
$lang->branch->featureBar['manage']['closed'] = 'Closed';
module/branch/lang/vi.php
+23 -5
View File
@@ -8,12 +8,30 @@ $lang->branch->add = 'Thêm';
$lang->branch->manageTitle = 'Quản lý %s';
$lang->branch->all = 'Tất cả ';
$lang->branch->id = 'ID';
$lang->branch->product = 'Sản phẩm';
$lang->branch->name = 'Tên';
$lang->branch->order = 'Sắp xếp';
$lang->branch->deleted = 'Xóa';
$lang->branch->create = 'Create Branch';
$lang->branch->merge = 'Merge';
$lang->branch->id = 'ID';
$lang->branch->product = 'Sản phẩm';
$lang->branch->name = 'Tên';
$lang->branch->status = 'Status';
$lang->branch->createdDate = 'Created Date';
$lang->branch->closedDate = 'Closed Date';
$lang->branch->desc = 'Desc';
$lang->branch->order = 'Sắp xếp';
$lang->branch->deleted = 'Xóa';
$lang->branch->confirmDelete = 'Bạn có muốn xóa @branch@ này?';
$lang->branch->canNotDelete = 'Có dữ liệu trong @branch@. Nó không thể bị xóa.';
$lang->branch->nameNotEmpty = 'Name must not be empty！';
$lang->branch->noData = 'No branches.';
$lang->branch->mainBranch = 'The default main branch of the product.';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = 'Active';
$lang->branch->statusList['closed'] = 'Closed';
$lang->branch->featureBar['manage']['all'] = 'All';
$lang->branch->featureBar['manage']['active'] = 'Active';
$lang->branch->featureBar['manage']['closed'] = 'Closed';
module/branch/lang/zh-cn.php
+2 -1
View File
@@ -25,7 +25,8 @@ $lang->branch->confirmDelete = '是否删除该@branch@？';
$lang->branch->canNotDelete = '该@branch@下已经有数据，不能删除！';
$lang->branch->nameNotEmpty = '名称不能为空！';
$lang->branch->noData = '暂时没有分支。';
$lang->branch->noData = '暂时没有分支。';
$lang->branch->mainBranch = '产品默认主干分支。';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = '激活';
module/branch/lang/zh-tw.php
+23 -5
View File
@@ -8,12 +8,30 @@ $lang->branch->add = '添加';
$lang->branch->manageTitle = '%s管理';
$lang->branch->all = '所有';
$lang->branch->id = '編號';
$lang->branch->product = '所屬產品';
$lang->branch->name = '名稱';
$lang->branch->order = '排序';
$lang->branch->deleted = '已刪除';
$lang->branch->create = '新增分支';
$lang->branch->merge = '合併';
$lang->branch->id = '編號';
$lang->branch->product = '所屬產品';
$lang->branch->name = '名稱';
$lang->branch->status = '狀態';
$lang->branch->createdDate = '創建時間';
$lang->branch->closedDate = '關閉時間';
$lang->branch->desc = '分支描述';
$lang->branch->order = '排序';
$lang->branch->deleted = '已刪除';
$lang->branch->confirmDelete = '是否刪除該@branch@？';
$lang->branch->canNotDelete = '該@branch@下已經有數據，不能刪除！';
$lang->branch->nameNotEmpty = '名稱不能為空！';
$lang->branch->noData = '暫時沒有分支。';
$lang->branch->mainBranch = '產品默認主幹分支。';
$lang->branch->statusList = array();
$lang->branch->statusList['active'] = '啟動';
$lang->branch->statusList['closed'] = '關閉';
$lang->branch->featureBar['manage']['all'] = '所有';
$lang->branch->featureBar['manage']['active'] = '啟動';
$lang->branch->featureBar['manage']['closed'] = '關閉';
module/branch/model.php
+23 -1
View File
@@ -42,13 +42,35 @@ class branchModel extends model
*/
public function getList($productID, $browseType = 'active', $orderBy, $pager = null)
{
return $this->dao->select('*')->from(TABLE_BRANCH)
$branchList = $this->dao->select('*')->from(TABLE_BRANCH)
->where('deleted')->eq(0)
->andWhere('product')->eq($productID)
->beginIF($browseType != 'all')->andWhere('status')->eq($browseType)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
if($browseType == 'closed')
{
return $branchList;
}
else
{
/* Display the main branch under all and active page. */
$mainBranch = new stdclass();
$mainBranch->id = MAIN;
$mainBranch->product = $productID;
$mainBranch->name = $this->lang->branch->main;
$mainBranch->default = 1;
$mainBranch->status = 'active';
$mainBranch->createdDate = '';
$mainBranch->closedDate = '';
$mainBranch->desc = $this->lang->branch->mainBranch;
$mainBranch->order = 0;
$pager->recTotal = $pager->recTotal + 1;
return array($mainBranch) + $branchList;
}
}
/**
module/branch/view/manage.html.php
+6 -5
View File
@@ -24,7 +24,7 @@
</div>
<div class="btn-toolbar pull-right">
<?php if(common::hasPriv('branch', 'create')):?>
<?php common::printLink('branch', 'create', "productID=$productID", "<i class='icon icon-plus'></i>" . $lang->branch->create, '', "class='btn btn-primary'");?>
<?php common::printLink('branch', 'create', "productID=$productID", "<i class='icon icon-plus'></i> " . $lang->branch->create, '', "class='btn btn-primary'");?>
<?php endif;?>
</div>
</div>
@@ -63,7 +63,7 @@
<tr>
<?php if(common::hasPriv('branch', 'batchEdit') or common::hasPriv('branch', 'mergeBranch')):?>
<td class='cell-id'>
<?php echo html::checkbox('branchIDList', array($branch->id => ''));?>
<?php echo html::checkbox('branchIDList', array($branch->id => ''), '', $branch->id == MAIN ? "disabled='disabled'" : '');?>
</td>
<?php endif;?>
<td class='c-actions sort-handler'><i class="icon icon-move"></i></td>
@@ -74,14 +74,15 @@
<td class='c-name' title='<?php echo $branch->desc;?>'><?php echo $branch->desc;?></td>
<td class='c-actions'>
<?php
common::printIcon('branch', 'edit', "branchID=$branch->id", $branch, 'list');
$disabled = $branch->id == MAIN ? 'disabled' : '';
common::printIcon('branch', 'edit', "branchID=$branch->id", $branch, 'list', '', '', $disabled);
if($branch->status == 'active')
{
common::printIcon('branch', 'closed', "branchID=$branch->id", $branch, 'list', 'off');
common::printIcon('branch', 'closed', "branchID=$branch->id", $branch, 'list', 'off', '', $disabled);
}
else
{
common::printIcon('branch', 'active', "branchID=$branch->id", $branch, 'list', 'active');
common::printIcon('branch', 'active', "branchID=$branch->id", $branch, 'list', 'active', '', $disabled);
}
?>
</td>