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

* Delete unused sql and fix error.

Browse Source
This commit is contained in:
Yagami
2020-09-27 13:59:15 +08:00
parent 5cce2eb83b
commit b84075ff72
7 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.0.sql
-4
View File
@@ -69,15 +69,11 @@ CREATE TABLE `zt_design` (
`commit` text NOT NULL,
`project` mediumint(9) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`parent` mediumint(8) unsigned NOT NULL,
`status` varchar(30) NOT NULL,
`subStatus` varchar(30) NOT NULL,
`createdBy` varchar(30) NOT NULL,
`createdDate` datetime NOT NULL,
`editedBy` varchar(30) NOT NULL,
`editedDate` datetime NOT NULL,
`commitBy` varchar(30) NOT NULL,
`commitDate` datetime NOT NULL,
`assignedTo` varchar(30) NOT NULL,
`assignedBy` varchar(30) NOT NULL,
`assignedDate` datetime NOT NULL,
db/zentao.sql
-4
View File
@@ -317,15 +317,11 @@ CREATE TABLE `zt_design` (
`commit` varchar(30) NOT NULL,
`project` mediumint(9) NOT NULL DEFAULT '0',
`name` varchar(255) NOT NULL,
`parent` mediumint(8) unsigned NOT NULL,
`status` varchar(30) NOT NULL,
`subStatus` varchar(30) NOT NULL,
`createdBy` varchar(30) NOT NULL,
`createdDate` datetime NOT NULL,
`editedBy` varchar(30) NOT NULL,
`editedDate` datetime NOT NULL,
`commitBy` varchar(30) NOT NULL,
`commitDate` datetime NOT NULL,
`assignedTo` varchar(30) NOT NULL,
`assignedBy` varchar(30) NOT NULL,
`assignedDate` datetime NOT NULL,
module/common/lang/zh-cn.php
+1 -1
View File
@@ -146,7 +146,7 @@ $lang->program->viewMenu->project = array('link' => "项目|program|pgmproject|p
$lang->product = new stdclass();
$lang->product->menu = new stdclass();
$lang->product->menu->home = '主页|product|index|';
$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create');
$lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit');
$lang->product->viewMenu = new stdclass();
$lang->product->viewMenu->requirement = array('link' => "用户需求|product|browse|productID=%s&branch=&browseType=unclosed&param=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
module/program/view/pgmproduct.html.php
+1 -1
View File
@@ -24,7 +24,7 @@
</div>
<div id="mainContent" class="main-row fade">
<div class="main-col">
<form class="main-table table-product" data-ride="table" id="productListForm" method="post" action='<?php echo inLink('batchEdit', "programID=$program->id");?>'>
<form class="main-table table-product" data-ride="table" id="productListForm" method="post" action='<?php echo $this->createLink('product', 'batchEdit', "programID=$program->id");?>'>
<?php $canOrder = common::hasPriv('product', 'updataOrder');?>
<?php $canBatchEdit = common::hasPriv('product', 'batchEdit');?>
<table id="productList" class="table has-sort-head table-fixed">
module/workestimation/lang/en.php
+1
View File
@@ -12,6 +12,7 @@ $lang->workestimation->hour = 'Man-hour';
$lang->workestimation->consumed = 'Cost Man-hours';
$lang->workestimation->programScaleTip = "Actual scale of current project: <strong>%s{$lang->hourCommon}</strong> <a href='###' id='useScale' class='btn btn-xs'> uses </span>";
$lang->workestimation->tips = 'Estimate the duration of the project only after the estimate of the workload has been completed';
$lang->workestimation->placeholder = new stdclass();
$lang->workestimation->placeholder->scale = '';
module/workestimation/lang/zh-cn.php
+1
View File
@@ -12,6 +12,7 @@ $lang->workestimation->hour = '工时';
$lang->workestimation->consumed = '已消耗工时';
$lang->workestimation->programScaleTip = "当前项目实际规模：<strong>%s{$lang->hourCommon}</strong> <a href='###' id='useScale' class='btn btn-xs'>使用</span>";
$lang->workestimation->tips = '完成工作量估算后，才能进行工期估算';
$lang->workestimation->placeholder = new stdclass();
$lang->workestimation->placeholder->scale = '';
module/workestimation/view/index.html.php
+1
View File
@@ -86,6 +86,7 @@
</tr>
</tbody>
</table>
<div class='alert alert-info mg-0'> <?php echo $lang->workestimation->tips;?></div>
</form>
</div>
</div>