diff --git a/Makefile b/Makefile index 8395691f37..0add78ded1 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/db/update12.4.4.sql b/db/update12.4.4.sql index cc54fde89a..66db1da873 100644 --- a/db/update12.4.4.sql +++ b/db/update12.4.4.sql @@ -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`); diff --git a/db/update20.0.alpha.sql b/db/update20.0.alpha.sql index cc061a99a2..b55d77d3fd 100644 --- a/db/update20.0.alpha.sql +++ b/db/update20.0.alpha.sql @@ -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, diff --git a/db/update20.0.beta2.sql b/db/update20.0.beta2.sql index 35ce9466a6..f44b67bad1 100644 --- a/db/update20.0.beta2.sql +++ b/db/update20.0.beta2.sql @@ -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`; diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index de415f1cb8..da44b756df 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -106,7 +106,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238'; -
  • +
  • > " . $subLibName, '', "class='text-ellipsis' title='{$subLibName}'");?>
  • diff --git a/module/release/view/browse.html.php b/module/release/view/browse.html.php index f3dec90d63..8762e91f3a 100644 --- a/module/release/view/browse.html.php +++ b/module/release/view/browse.html.php @@ -42,9 +42,9 @@ release->id;?> - release->name;?> - release->project;?> - release->build;?> + release->name;?> + release->project;?> + release->build;?> type != 'normal'):?> product->branch;?> @@ -65,7 +65,7 @@ marker ? " " : ''; - 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; ?> PRJName;?> diff --git a/module/user/model.php b/module/user/model.php index 8fdd116f2c..3e493130e4 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -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);