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

Merge branch 'master' of https://git.zcorp.cc/zentaopms

Browse Source
This commit is contained in:
tianshujie98
2021-01-28 09:39:20 +08:00
parent 8ef40239b4 069c237f39
commit 726eebbad6
7 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -147,7 +147,7 @@ pms:
cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
make package
zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
rm -fr zentaopms #entaoxx zentaoxx.*.zip
rm -fr zentaopms zentaoxx zentaoxx.*.zip
deb:
mkdir buildroot
cp -r build/debian/DEBIAN buildroot
db/update12.4.4.sql
-1
View File
@@ -1,7 +1,6 @@
ALTER TABLE `zt_job` ADD `customParam` text AFTER `atTime`;
ALTER TABLE `zt_doc` ADD `mailto` text AFTER `editedDate`;
ALTER TABLE `zt_task` CHANGE `realStarted` `realStarted` datetime NOT NULL AFTER `estStarted`;
ALTER TABLE `zt_group` CHANGE `program` `PRJ` mediumint(8) unsigned NOT NULL DEFAULT 0;
ALTER TABLE `zt_user` ADD `type` char(30) NOT NULL default 'inside' AFTER `account`;
ALTER TABLE `zt_notify` ADD INDEX `objectType_toList_status` (`objectType`, `toList`, `status`);
db/update20.0.alpha.sql
+1 -1
View File
@@ -156,7 +156,7 @@ CREATE TABLE IF NOT EXISTS `zt_issue` (
`editedDate` datetime NOT NULL,
`activateBy` varchar(30) NOT NULL,
`activateDate` date NOT NULL,
`closeBy` varchar(30) NOT NULL,
`closedBy` varchar(30) NOT NULL,
`closedDate` date NOT NULL,
`assignedTo` varchar(30) NOT NULL,
`assignedBy` varchar(30) NOT NULL,
db/update20.0.beta2.sql
-1
View File
@@ -1,5 +1,4 @@
ALTER TABLE `zt_risk` add `closedBy` char(30) AFTER `assignedTo`;
ALTER TABLE `zt_risk` add `closedDate` date AFTER `closedBy`;
ALTER TABLE `zt_issue` CHANGE `closeBy` `closedBy` char(30);
ALTER TABLE `zt_repo` CHANGE `PRJ` `product` varchar(255) NOT NULL AFTER `id`;
ALTER TABLE `zt_project` CHANGE `budgetUnit` `budgetUnit` char(30) NOT NULL DEFAULT 'wanyuan' AFTER `budget`;
module/doc/view/side.html.php
+1 -1
View File
@@ -106,7 +106,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
</li>
<?php endif;?>
<?php if($customLibCount == 0 and !is_numeric($subLibID)):?>
<li>
<li <?php echo $activeClass;?>>
<?php echo html::a($subLibLink, "<i class='icon {$icon}'></i> " . $subLibName, '', "class='text-ellipsis' title='{$subLibName}'");?>
</li>
<?php endif;?>
module/release/view/browse.html.php
+4 -4
View File
@@ -42,9 +42,9 @@
<thead>
<tr>
<th class='w-id'><?php echo $lang->release->id;?></th>
<th><?php echo $lang->release->name;?></th>
<th><?php echo $lang->release->project;?></th>
<th><?php echo $lang->release->build;?></th>
<th class="c-name"><?php echo $lang->release->name;?></th>
<th class="w-200px"><?php echo $lang->release->project;?></th>
<th class="w-200px"><?php echo $lang->release->build;?></th>
<?php if($product->type != 'normal'):?>
<th class='text-center w-100px'><?php echo $lang->product->branch;?></th>
<?php endif;?>
@@ -65,7 +65,7 @@
<td>
<?php
$flagIcon = $release->marker ? "<icon class='icon icon-flag red' title='{$lang->release->marker}'></icon> " : '';
echo html::a(inlink('view', "release=$release->id"), $release->name) . $flagIcon;
echo html::a(inlink('view', "release=$release->id"), $release->name, '', "title='$release->name'") . $flagIcon;
?>
</td>
<td title='<?php echo $release->PRJName?>'><?php echo $release->PRJName;?></td>
module/user/model.php
+1 -1
View File
@@ -1153,7 +1153,7 @@ class userModel extends model
* @return void
*/
public function uploadAvatar()
{
{
$uploadResult = $this->loadModel('file')->saveUpload('avatar');
if(!$uploadResult) return array('result' => 'fail', 'message' => $this->lang->fail);