From 78aa4d5f688779e6cfcb19fd5a22a85f007bc9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Thu, 20 Sep 2018 10:21:46 +0800 Subject: [PATCH 01/16] * Change for task#4773. --- .../block/view/productstatisticblock.html.php | 24 +++++++++---------- .../block/view/projectstatisticblock.html.php | 24 +++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/module/block/view/productstatisticblock.html.php b/module/block/view/productstatisticblock.html.php index 98f913479b..39d4aefb71 100644 --- a/module/block/view/productstatisticblock.html.php +++ b/module/block/view/productstatisticblock.html.php @@ -35,13 +35,13 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po .block-statistic .tile {margin-bottom: 30px;} .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;} .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;} -.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding: 0;} +.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 260px; padding: 0;} .block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;} .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;} .block-statistic .nav-secondary > li.active > a:hover, .block-statistic .nav-secondary > li.active > a:focus, -.block-statistic .nav-secondary > li > a:hover {box-shadow: none;} -.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} +.block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;} +.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} .block-statistic .nav-secondary > li.switch-icon {display: none;} .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px;} .block-statistic.block-sm .panel-body > .table-row, @@ -87,6 +87,15 @@ $(function()

block->noData;?>

+
+ +
@@ -199,15 +208,6 @@ $(function()
-
- -
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php index 1be9be768b..e8072c1971 100644 --- a/module/block/view/projectstatisticblock.html.php +++ b/module/block/view/projectstatisticblock.html.php @@ -22,13 +22,13 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po .block-statistic .tile {margin-bottom: 30px;} .block-statistic .tile-title {font-size: 18px; color: #A6AAB8;} .block-statistic .tile-amount {font-size: 48px; margin-bottom: 10px;} -.block-statistic .col-nav {border-left: 1px solid #EBF2FB; width: 260px; padding: 0;} +.block-statistic .col-nav {border-right: 1px solid #EBF2FB; width: 260px; padding: 0;} .block-statistic .nav-secondary > li > a {font-size: 14px; color: #838A9D; position: relative; box-shadow: none; padding-left: 20px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; transition: all .2s;} .block-statistic .nav-secondary > li.active > a {color: #3C4353; background: transparent; box-shadow: none;} .block-statistic .nav-secondary > li.active > a:hover, .block-statistic .nav-secondary > li.active > a:focus, -.block-statistic .nav-secondary > li > a:hover {box-shadow: none;} -.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; left: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} +.block-statistic .nav-secondary > li > a:hover {box-shadow: none; border-radius: 4px 0 0 4px;} +.block-statistic .nav-secondary > li.active > a:before {content: ' '; display: block; right: -1px; top: 10px; bottom: 10px; width: 4px; background: #006af1; position: absolute;} .block-statistic .nav-secondary > li.switch-icon {display: none;} .block-statistic.block-sm .panel-body {padding-bottom: 10px; position: relative; padding-top: 45px; border-radius: 3px;} .block-statistic.block-sm .panel-body > .table-row, @@ -73,6 +73,15 @@ $(function()

block->noData;?>

+
+ +
@@ -152,15 +161,6 @@ $(function()
-
- -
From 6cedbefacc0a79bdb4f7740158a2105cc3af9d7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Thu, 20 Sep 2018 10:54:18 +0800 Subject: [PATCH 02/16] * Finish task#4864. --- module/company/js/browse.js | 1 + 1 file changed, 1 insertion(+) diff --git a/module/company/js/browse.js b/module/company/js/browse.js index e69de29bb2..13ce9f67b3 100644 --- a/module/company/js/browse.js +++ b/module/company/js/browse.js @@ -0,0 +1 @@ +$(".tree .active").parent('li').addClass('active'); \ No newline at end of file From 1350c2c856f6f92c3419a83d84ed4fb380cc4387 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 25 Sep 2018 10:27:00 +0800 Subject: [PATCH 03/16] * change text align format in task table. --- module/task/model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/model.php b/module/task/model.php index b5df21770c..e741274170 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2376,7 +2376,7 @@ class taskModel extends model if($id == 'name') $class .= ' text-left'; if($id == 'deadline' and isset($task->delay)) $class .= ' delayed'; if($id == 'assignedTo') $class .= ' has-btn text-left'; - if(strpos('consumed,left,progress', $id) !== false) $class .= ' text-right'; + if(strpos('progress', $id) !== false) $class .= ' text-right'; $title = ''; if($id == 'name') @@ -2463,7 +2463,7 @@ class taskModel extends model $assignToLink = helper::createLink('task', 'assignTo', "projectID=$task->project&taskID=$task->id", '', true); $assignToHtml = html::a($assignToLink, " {$assignedToText}", '', "class='$btnClass'"); - echo !common::hasPriv('task', 'assignTo') ? "{$assignedToText}" : $assignToHtml; + echo !common::hasPriv('task', 'assignTo') ? "{$assignedToText}" : $assignToHtml; break; case 'assignedDate': echo substr($task->assignedDate, 5, 11); From 756ef3606669c26a12315e86a30914f7b0f5a447 Mon Sep 17 00:00:00 2001 From: Catouse Date: Tue, 25 Sep 2018 10:50:47 +0800 Subject: [PATCH 04/16] * remove label-info class from module label in task table. --- module/task/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/task/model.php b/module/task/model.php index e741274170..2c75c83e68 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2407,7 +2407,7 @@ class taskModel extends model break; case 'name': if(!empty($task->product) && isset($branchGroups[$task->product][$task->branch])) echo "" . $branchGroups[$task->product][$task->branch] . ' '; - if(empty($task->children) and $task->module and isset($modulePairs[$task->module])) echo "" . $modulePairs[$task->module] . ' '; + if(empty($task->children) and $task->module and isset($modulePairs[$task->module])) echo "" . $modulePairs[$task->module] . ' '; if($child or !empty($task->parent)) echo '' . $this->lang->task->childrenAB . ' '; if(!empty($task->team)) echo '' . $this->lang->task->multipleAB . ' '; echo $canView ? html::a($taskLink, $task->name, null, "style='color: $task->color'") : "$task->name"; From 0520b7e34033956ca35bdabc0d8a81c86439b6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Tue, 25 Sep 2018 11:39:15 +0800 Subject: [PATCH 05/16] * Finish task#4795. --- module/file/control.php | 36 ++++++++++++++++++++++++++++++++++++ www/api.php | 8 ++++++-- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/module/file/control.php b/module/file/control.php index 9571a83a0b..7da85a885b 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -75,6 +75,42 @@ class file extends control } } + /** + * @access public + * @return void + */ + public function apiUpload($uid = '') + { + $file = $this->file->getUpload('file'); + $file = $file[0]; + if($file) + { + if($file['size'] == 0) die(json_encode(array('status' => 'error', 'message' => $this->lang->file->errorFileUpload))); + if(@move_uploaded_file($file['tmpname'], $this->file->savePath . $this->file->getSaveName($file['pathname']))) + { + /* Compress image for jpg and bmp. */ + $file = $this->file->compressImage($file); + + $file['addedBy'] = $this->app->user->account; + $file['addedDate'] = helper::today(); + unset($file['tmpname']); + $this->dao->insert(TABLE_FILE)->data($file)->exec(); + + $_SERVER['SCRIPT_NAME'] = 'index.php'; + $fileID = $this->dao->lastInsertID(); + $url = $this->createLink('file', 'read', "fileID=$fileID", $file['extension']); + if($uid) $_SESSION['album'][$uid][] = $fileID; + die(json_encode(array('status' => 'seccess', 'data' => commonModel::getSysURL() . $this->config->webRoot . $url))); + } + else + { + $error = strip_tags(sprintf($this->lang->file->errorCanNotWrite, $this->file->savePath, $this->file->savePath)); + die(json_encode(array('status' => 'error', 'message' => $error))); + } + } + die(json_encode(array('status' => 'error', 'message' => $this->lang->file->errorFileUpload))); + } + /** * AJAX: get upload request from the web editor. * diff --git a/www/api.php b/www/api.php index 47b3c0f838..565bf7aeb2 100644 --- a/www/api.php +++ b/www/api.php @@ -13,7 +13,7 @@ */ /* Set the error reporting. */ error_reporting(0); - +define('RUN_MODE', 'api'); /* Start output buffer. */ ob_start(); @@ -44,7 +44,11 @@ $common->checkPriv(); $app->loadModule(); $output = json_decode(ob_get_clean()); -$output = json_encode($output->data); +$data = new stdClass(); +$data->status = $output->status; +if(isset($output->message)) $data->message = $output->message; +if(isset($output->data)) $data->data = json_decode($output->data); +$output = json_encode($data); unset($_SESSION['ENTRY_CODE']); unset($_SESSION['VALID_ENTRY']); From 57137612e1b5937d2929ad0fa62f130792d68bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Tue, 25 Sep 2018 11:44:53 +0800 Subject: [PATCH 06/16] * Finish task#4795. --- module/file/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/file/control.php b/module/file/control.php index 7da85a885b..3157820996 100644 --- a/module/file/control.php +++ b/module/file/control.php @@ -108,7 +108,7 @@ class file extends control die(json_encode(array('status' => 'error', 'message' => $error))); } } - die(json_encode(array('status' => 'error', 'message' => $this->lang->file->errorFileUpload))); + die(json_encode(array('status' => 'error', 'message' => $this->lang->file->uploadImagesExplain))); } /** From 1627f130449fd12a2fae72bc2bf939cdc01ea2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Tue, 25 Sep 2018 12:14:53 +0800 Subject: [PATCH 07/16] * Task#4796. --- module/bug/control.php | 16 ++++++++++++++-- www/api.php | 4 ++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/module/bug/control.php b/module/bug/control.php index f145caaa5d..292476543b 100644 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -294,6 +294,8 @@ class bug extends control $this->action->create('todo', $output['todoID'], 'finished', '', "BUG:$bugID"); } + if($this->viewType == 'json') $this->send(array('status' => 'success', 'data' => $bugID)); + $location = $this->createLink('bug', 'browse', "productID={$this->post->product}&branch=$branch&type=byModule¶m={$this->post->module}"); $response['locate'] = isset($_SESSION['bugList']) ? $this->session->bugList : $location; $this->send($response); @@ -577,7 +579,17 @@ class bug extends control if($comment == false) { $changes = $this->bug->update($bugID); - if(dao::isError()) die(js::error(dao::getError())); + if(dao::isError()) + { + if($this->viewType == 'json') + { + $this->send(array('status' => 'error', 'message' => dao::getError())); + } + else + { + die(js::error(dao::getError())); + } + } $files = $this->loadModel('file')->saveUpload('bug', $bugID); } if($this->post->comment != '' or !empty($changes) or !empty($files)) @@ -588,7 +600,7 @@ class bug extends control $actionID = $this->action->create('bug', $bugID, $action, $fileAction . $this->post->comment); $this->action->logHistory($actionID, $changes); } - + if($this->viewType == 'json') $this->send(array('status' => 'success', 'data' => $bugID)); $bug = $this->bug->getById($bugID); if($bug->toTask != 0) { diff --git a/www/api.php b/www/api.php index 565bf7aeb2..abe85d249b 100644 --- a/www/api.php +++ b/www/api.php @@ -44,8 +44,8 @@ $common->checkPriv(); $app->loadModule(); $output = json_decode(ob_get_clean()); -$data = new stdClass(); -$data->status = $output->status; +$data = new stdClass(); +$data->status = isset($output->status) ? $output->status : $output->result; if(isset($output->message)) $data->message = $output->message; if(isset($output->data)) $data->data = json_decode($output->data); $output = json_encode($data); From f6cb04cd44539a8a3c6c02246de21034e3cfe8e5 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 25 Sep 2018 13:11:06 +0800 Subject: [PATCH 08/16] * change http to https. --- module/common/lang/en.php | 6 +++--- module/common/lang/zh-cn.php | 6 +++--- module/entry/config.php | 2 +- module/extension/config.php | 2 +- module/extension/lang/en.php | 2 +- module/extension/lang/zh-cn.php | 2 +- module/extension/lang/zh-tw.php | 2 +- module/extension/model.php | 26 ++------------------------ module/install/lang/en.php | 6 +++--- module/install/lang/zh-cn.php | 8 ++++---- module/install/model.php | 6 +++--- module/misc/lang/en.php | 2 +- module/misc/lang/zh-cn.php | 2 +- module/my/lang/en.php | 2 +- module/my/lang/zh-cn.php | 2 +- module/my/lang/zh-tw.php | 2 +- module/project/lang/en.php | 2 +- module/project/lang/zh-cn.php | 2 +- module/report/lang/en.php | 2 +- module/report/lang/zh-cn.php | 2 +- module/testreport/lang/en.php | 2 +- module/testreport/lang/zh-cn.php | 2 +- module/todo/model.php | 24 ++++++++++++++---------- module/user/view/login.html.php | 2 +- 24 files changed, 49 insertions(+), 67 deletions(-) diff --git a/module/common/lang/en.php b/module/common/lang/en.php index d4f7d65b6d..eb77725c81 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -81,7 +81,7 @@ $lang->homepage = 'Set as Home'; $lang->tutorial = 'Tutorial'; $lang->changeLog = 'Change Log'; $lang->manual = 'Manual'; -$lang->manualUrl = 'http://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; +$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = 'Custom Menu'; $lang->customField = 'Custom Field'; $lang->lineNumber = 'Line No.'; @@ -478,9 +478,9 @@ $lang->pager->previousPage = "Prev"; $lang->pager->nextPage = "Next"; $lang->pager->summery = "%s-%s of %s."; -$lang->proVersion = "ZenTao Pro   "; +$lang->proVersion = "ZenTao Pro   "; $lang->downNotify = "Download Desktop Notification"; -$lang->website = "http://www.zentao.net"; +$lang->website = "https://www.zentao.net"; $lang->suhosinInfo = "Warning! Data is reaching the limit. Please change sohusin.post.max_vars and sohusin.request.max_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; $lang->maxVarsInfo = "Warning! Data is reaching the limit. Please change max_input_vars (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved."; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index ed31a23892..8ed19b6c31 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -81,7 +81,7 @@ $lang->homepage = '设为模块首页'; $lang->tutorial = '新手教程'; $lang->changeLog = '修改日志'; $lang->manual = '手册'; -$lang->manualUrl = 'http://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; +$lang->manualUrl = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao'; $lang->customMenu = '自定义导航'; $lang->customField = '自定义表单项'; $lang->lineNumber = '行号'; @@ -478,9 +478,9 @@ $lang->pager->previousPage = "上一页"; $lang->pager->nextPage = "下一页"; $lang->pager->summery = "第 %s-%s 项，共 %s 项"; -$lang->proVersion = "专业版   "; +$lang->proVersion = "专业版   "; $lang->downNotify = "下载桌面提醒"; -$lang->website = "http://www.zentao.net"; +$lang->website = "https://www.zentao.net"; $lang->suhosinInfo = "警告：数据太多，请在php.ini中修改sohusin.post.max_vars和sohusin.request.max_vars（大于%s的数）。 保存并重新启动apache或php-fpm，否则会造成部分数据无法保存。"; $lang->maxVarsInfo = "警告：数据太多，请在php.ini中修改max_input_vars（大于%s的数）。 保存并重新启动apache或php-fpm，否则会造成部分数据无法保存。"; diff --git a/module/entry/config.php b/module/entry/config.php index b6489cc595..2d8908135d 100644 --- a/module/entry/config.php +++ b/module/entry/config.php @@ -5,7 +5,7 @@ $config->entry->create->requiredFields = 'name, code, account, key'; $config->entry->edit = new stdclass(); $config->entry->edit->requiredFields = 'name, code, account, key'; -$config->entry->help = 'http://www.zentao.net/book/zentaopmshelp/integration-287.html'; +$config->entry->help = 'https://www.zentao.net/book/zentaopmshelp/integration-287.html'; $config->entry->errcode['PARAM_CODE_MISSING'] = 401; $config->entry->errcode['PARAM_TOKEN_MISSING'] = 401; diff --git a/module/extension/config.php b/module/extension/config.php index 5e92a4312c..8ffd0ccfcf 100644 --- a/module/extension/config.php +++ b/module/extension/config.php @@ -1,4 +1,4 @@ extension = new stdclass(); -$config->extension->apiRoot = 'http://api.zentao.net/extension-'; +$config->extension->apiRoot = 'https://api.zentao.net/extension-'; $config->extension->extPathes = array('module', 'bin', 'www', 'library', 'config'); diff --git a/module/extension/lang/en.php b/module/extension/lang/en.php index af95cd08fd..e099087a8f 100644 --- a/module/extension/lang/en.php +++ b/module/extension/lang/en.php @@ -38,7 +38,7 @@ $lang->extension->dirs = 'Directories'; $lang->extension->files = 'Files'; $lang->extension->status = 'Status'; $lang->extension->version = 'Version'; -$lang->extension->latest = 'Latest:%s，need zentao %s'; +$lang->extension->latest = 'Latest:%s，need zentao %s'; $lang->extension->author = 'Author'; $lang->extension->license = 'License'; $lang->extension->site = 'Website'; diff --git a/module/extension/lang/zh-cn.php b/module/extension/lang/zh-cn.php index ee38b9e1e5..b161e0bbde 100644 --- a/module/extension/lang/zh-cn.php +++ b/module/extension/lang/zh-cn.php @@ -38,7 +38,7 @@ $lang->extension->dirs = '安装目录'; $lang->extension->files = '安装文件'; $lang->extension->status = '状态'; $lang->extension->version = '版本'; -$lang->extension->latest = '最新版本%s，兼容禅道%s'; +$lang->extension->latest = '最新版本%s，兼容禅道%s'; $lang->extension->author = '作者'; $lang->extension->license = '授权'; $lang->extension->site = '官网'; diff --git a/module/extension/lang/zh-tw.php b/module/extension/lang/zh-tw.php index 720356e0fe..38af9f77ce 100644 --- a/module/extension/lang/zh-tw.php +++ b/module/extension/lang/zh-tw.php @@ -38,7 +38,7 @@ $lang->extension->dirs = '安裝目錄'; $lang->extension->files = '安裝檔案'; $lang->extension->status = '狀態'; $lang->extension->version = '版本'; -$lang->extension->latest = '最新版本%s，兼容禪道%s'; +$lang->extension->latest = '最新版本%s，兼容禪道%s'; $lang->extension->author = '作者'; $lang->extension->license = '授權'; $lang->extension->site = '官網'; diff --git a/module/extension/model.php b/module/extension/model.php index e1917e8b6e..afb3f6f627 100644 --- a/module/extension/model.php +++ b/module/extension/model.php @@ -16,14 +16,6 @@ class extensionModel extends model */ const EXT_MANAGER_VERSION = '1.3'; - /** - * The api agent(use snoopy). - * - * @var object - * @access public - */ - public $agent; - /** * The api root. * @@ -41,22 +33,10 @@ class extensionModel extends model public function __construct() { parent::__construct(); - $this->setAgent(); $this->setApiRoot(); $this->classFile = $this->app->loadClass('zfile'); } - /** - * Set the api agent. - * - * @access public - * @return void - */ - public function setAgent() - { - $this->agent = $this->app->loadClass('snoopy'); - } - /** * Set the apiRoot. * @@ -78,8 +58,7 @@ class extensionModel extends model public function fetchAPI($url) { $url .= (strpos($url, '?') === false ? '?' : '&') . 'lang=' . str_replace('-', '_', $this->app->getClientLang()) . '&managerVersion=' . self::EXT_MANAGER_VERSION . '&zentaoVersion=' . $this->config->version; - $this->agent->fetch($url); - $result = json_decode($this->agent->results); + $result = json_decode(common::http($url)); if(!isset($result->status)) return false; if($result->status != 'success') return false; @@ -170,8 +149,7 @@ class extensionModel extends model public function downloadPackage($extension, $downLink) { $packageFile = $this->getPackageFile($extension); - $this->agent->fetch($downLink); - file_put_contents($packageFile, $this->agent->results); + file_put_contents($packageFile, common::http($downLink)); } /** diff --git a/module/install/lang/en.php b/module/install/lang/en.php index 1bbe1c1256..3c63d29a1d 100644 --- a/module/install/lang/en.php +++ b/module/install/lang/en.php @@ -31,8 +31,8 @@ ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independ EOT; $lang->install->links = <<Nature Easy Soft Co., LTD. -Official Website : http://www.zentao.pm -Technical Support : http://www.zentao.pm/forum/ +Official Website : https://www.zentao.pm +Technical Support : https://www.zentao.pm/forum/ WhatsApp Group : https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF Twitter: cneasysoft @@ -168,7 +168,7 @@ $lang->install->login = 'Login ZenTao'; $lang->install->register = 'Register in ZenTao'; $lang->install->joinZentao = <<You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).

+

You have installed ZenTao %s. Please delete install.php asap.

Note: In order to get the latest news of ZenTao, please register in ZenTao(www.zentao.pm).

EOT; $lang->install->product = array('chanzhi', 'ranzhi'); diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php index c813bb19ec..2d376227d0 100644 --- a/module/install/lang/zh-cn.php +++ b/module/install/lang/zh-cn.php @@ -17,7 +17,7 @@ $lang->install->pre = '返回'; $lang->install->reload = '刷新'; $lang->install->error = '错误 '; -$lang->install->officeDomain = 'http://www.zentao.net'; +$lang->install->officeDomain = 'https://www.zentao.net'; $lang->install->start = '开始安装'; $lang->install->keepInstalling = '继续安装当前版本'; @@ -31,8 +31,8 @@ $lang->install->desc = <<install->links = <<青岛易软天创网络科技有限公司开发。 -官方网站：http://www.zentao.net -技术支持：http://www.zentao.net/ask/ +官方网站：https://www.zentao.net +技术支持：https://www.zentao.net/ask/ 新浪微博：http://weibo.com/easysoft @@ -168,7 +168,7 @@ $lang->install->login = '登录禅道管理系统'; $lang->install->register = '禅道社区注册'; $lang->install->joinZentao = <<您已经成功安装禅道管理系统%s，请及时删除install.php。

友情提示：为了您及时获得禅道的最新动态，请在禅道社区(www.zentao.net)进行登记。

+

您已经成功安装禅道管理系统%s，请及时删除install.php。

友情提示：为了您及时获得禅道的最新动态，请在禅道社区(www.zentao.net)进行登记。

EOT; $lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan'); diff --git a/module/install/model.php b/module/install/model.php index d2ef6574b3..bb9d0b3b65 100644 --- a/module/install/model.php +++ b/module/install/model.php @@ -60,10 +60,10 @@ class installModel extends model public function getLatestRelease() { if(!function_exists('json_decode')) return false; - $snoopy = $this->app->loadClass('snoopy'); - if(@$snoopy->fetchText('http://www.zentao.net/misc-getlatestrelease.json')) + $result = common::http('http://www.zentao.net/misc-getlatestrelease.json'); + if($result) { - $result = json_decode($snoopy->results); + $result = json_decode($result); if(isset($result->release) and $this->config->version != $result->release->version) { return $result->release; diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 1a858ceb0b..93c3cad352 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -12,7 +12,7 @@ $lang->misc = new stdclass(); $lang->misc->common = 'Misc'; $lang->misc->ping = 'Ping'; -$lang->misc->api = 'http://api.zentao.net'; +$lang->misc->api = 'https://api.zentao.net'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = 'Version %s'; diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index bf88cffcc6..9a870cecb2 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -12,7 +12,7 @@ $lang->misc = new stdclass(); $lang->misc->common = '杂项'; $lang->misc->ping = '防超时'; -$lang->misc->api = 'http://api.zentao.net'; +$lang->misc->api = 'https://api.zentao.net'; $lang->misc->zentao = new stdclass(); $lang->misc->zentao->version = '版本%s'; diff --git a/module/my/lang/en.php b/module/my/lang/en.php index 9f7e01d1fd..ef69befdae 100644 --- a/module/my/lang/en.php +++ b/module/my/lang/en.php @@ -44,7 +44,7 @@ $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; $lang->my->home->createProject = "Create {$lang->projectCommon}"; $lang->my->home->createProduct = "Create {$lang->productCommon}"; -$lang->my->home->help = "Help"; +$lang->my->home->help = "Help"; $lang->my->home->noProductsTip = "No {$lang->productCommon} found here."; $lang->my->form = new stdclass(); diff --git a/module/my/lang/zh-cn.php b/module/my/lang/zh-cn.php index 3ef9c20b22..f63c895337 100644 --- a/module/my/lang/zh-cn.php +++ b/module/my/lang/zh-cn.php @@ -44,7 +44,7 @@ $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; $lang->my->home->createProject = "创建一个{$lang->projectCommon}"; $lang->my->home->createProduct = "创建一个{$lang->productCommon}"; -$lang->my->home->help = "帮助文档"; +$lang->my->home->help = "帮助文档"; $lang->my->home->noProductsTip = "这里还没有{$lang->productCommon}。"; $lang->my->form = new stdclass(); diff --git a/module/my/lang/zh-tw.php b/module/my/lang/zh-tw.php index fb7d9c395e..bac4cfc7da 100644 --- a/module/my/lang/zh-tw.php +++ b/module/my/lang/zh-tw.php @@ -44,7 +44,7 @@ $lang->my->home->projects = $lang->projectCommon; $lang->my->home->products = $lang->productCommon; $lang->my->home->createProject = "創建一個{$lang->projectCommon}"; $lang->my->home->createProduct = "創建一個{$lang->productCommon}"; -$lang->my->home->help = "幫助文檔"; +$lang->my->home->help = "幫助文檔"; $lang->my->home->noProductsTip = "這裡還沒有{$lang->productCommon}。"; $lang->my->form = new stdclass(); diff --git a/module/project/lang/en.php b/module/project/lang/en.php index af7c0912ef..c4329fcae7 100644 --- a/module/project/lang/en.php +++ b/module/project/lang/en.php @@ -205,7 +205,7 @@ $lang->project->timeSummary = '
Tasks %s ：Wait %s   Doing %s
Est. %s ：Cost %s   Left %s
"; $lang->project->wbs = "Decompose Tasks"; $lang->project->batchWBS = "Batch Decompose"; -$lang->project->howToUpdateBurn = "Help "; +$lang->project->howToUpdateBurn = "Help "; $lang->project->whyNoStories = "No Story can be linked. Please check whether there is Story in {$lang->projectCommon} linked {$lang->productCommon} and make sure it has been reviewed."; $lang->project->productStories = "{$lang->projectCommon} linked story is the subeset of {$lang->productCommon}, which can only be linked after review. Please Link Story。"; $lang->project->haveDraft = "There are %s draft stories can't be linked."; diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php index 94ccfbab4d..de4b8db9bb 100644 --- a/module/project/lang/zh-cn.php +++ b/module/project/lang/zh-cn.php @@ -205,7 +205,7 @@ $lang->project->timeSummary = '
总任务 %s : 未开始 %s   进行中 %s
总预计 %s : 已消耗 %s   剩余 %s
"; $lang->project->wbs = "分解任务"; $lang->project->batchWBS = "批量分解"; -$lang->project->howToUpdateBurn = "帮助 "; +$lang->project->howToUpdateBurn = "帮助 "; $lang->project->whyNoStories = "看起来没有需求可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有需求，而且要确保它们已经审核通过。"; $lang->project->productStories = "{$lang->projectCommon}关联的需求是{$lang->productCommon}需求的子集，并且只有评审通过的需求才能关联。请关联需求。"; $lang->project->haveDraft = "有%s条草稿状态的需求无法关联到该{$lang->projectCommon}"; diff --git a/module/report/lang/en.php b/module/report/lang/en.php index e0528f8538..8565483277 100644 --- a/module/report/lang/en.php +++ b/module/report/lang/en.php @@ -99,5 +99,5 @@ $lang->report->mailTitle->task = " Task (%s),"; $lang->report->mailTitle->todo = " Todo (%s),"; $lang->report->mailTitle->testTask = " Test Task (%s),"; -$lang->report->proVersion = 'Try ZenTao Pro for more!'; +$lang->report->proVersion = 'Try ZenTao Pro for more!'; $lang->report->proVersionEn = 'Try ZenTao Pro for more!'; diff --git a/module/report/lang/zh-cn.php b/module/report/lang/zh-cn.php index 2f7333d183..4ab6d666e5 100644 --- a/module/report/lang/zh-cn.php +++ b/module/report/lang/zh-cn.php @@ -99,5 +99,5 @@ $lang->report->mailTitle->task = " 任务(%s),"; $lang->report->mailTitle->todo = " 待办(%s),"; $lang->report->mailTitle->testTask = " 测试版本(%s),"; -$lang->report->proVersion = '更多精彩，尽在专业版！'; +$lang->report->proVersion = '更多精彩，尽在专业版！'; $lang->report->proVersionEn = 'Try ZenTao Pro for more!'; diff --git a/module/testreport/lang/en.php b/module/testreport/lang/en.php index ca8d407f30..356ddb4c76 100644 --- a/module/testreport/lang/en.php +++ b/module/testreport/lang/en.php @@ -59,7 +59,7 @@ $lang->testreport->caseSummary = ' %s cases in Total : testreport->buildSummary = 'Tested %s build.'; $lang->testreport->confirmDelete = 'Do you want tot delete this report?'; $lang->testreport->moreNotice = 'More features can be extended with reference to the ZenTao extension mechanism, or you can contact us for customization.'; -$lang->testreport->exportNotice = "Export By ZenTaoPMS"; +$lang->testreport->exportNotice = "Export By ZenTaoPMS"; $lang->testreport->noReport = "No report has been generated. Please check it later."; $lang->testreport->foundBugTip = "Bugs created in this build and created in the test period."; $lang->testreport->legacyBugTip = "Active Bugs, or the resolved beyond the test period."; diff --git a/module/testreport/lang/zh-cn.php b/module/testreport/lang/zh-cn.php index 82b8cf6d2e..57f8f1234b 100644 --- a/module/testreport/lang/zh-cn.php +++ b/module/testreport/lang/zh-cn.php @@ -59,7 +59,7 @@ $lang->testreport->caseSummary = '共有%s个用例，共执 $lang->testreport->buildSummary = '共测试了%s个版本。'; $lang->testreport->confirmDelete = '是否删除该报告？'; $lang->testreport->moreNotice = '更多功能可以参考禅道扩展机制进行扩展，也可以联系我们进行定制。'; -$lang->testreport->exportNotice = "由禅道项目管理软件导出"; +$lang->testreport->exportNotice = "由禅道项目管理软件导出"; $lang->testreport->noReport = "报表还没有生成，请稍候查看。"; $lang->testreport->foundBugTip = "影响版本在测试轮次内，并且创建时间在测试时间范围内产生的Bug数。"; $lang->testreport->legacyBugTip = "Bug状态是激活，或Bug的解决时间在测试结束时间之后。"; diff --git a/module/todo/model.php b/module/todo/model.php index 4a468d17fe..7e93163643 100644 --- a/module/todo/model.php +++ b/module/todo/model.php @@ -448,6 +448,7 @@ class todoModel extends model { $this->loadModel('action'); $today = helper::today(); + $now = helper::now(); $lastCycleList = $this->dao->select('*')->from(TABLE_TODO)->where('type')->eq('cycle')->andWhere('idvalue')->in(array_keys($todoList))->orderBy('date_asc')->fetchAll('idvalue'); foreach($todoList as $todoID => $todo) { @@ -459,16 +460,19 @@ class todoModel extends model if($today < $begin or (!empty($end) && $today > $end)) continue; $newTodo = new stdclass(); - $newTodo->account = $todo->account; - $newTodo->begin = $todo->begin; - $newTodo->end = $todo->end; - $newTodo->type = 'cycle'; - $newTodo->idvalue = $todoID; - $newTodo->pri = $todo->pri; - $newTodo->name = $todo->name; - $newTodo->desc = $todo->desc; - $newTodo->status = 'wait'; - $newTodo->private = $todo->private; + $newTodo->account = $todo->account; + $newTodo->begin = $todo->begin; + $newTodo->end = $todo->end; + $newTodo->type = 'cycle'; + $newTodo->idvalue = $todoID; + $newTodo->pri = $todo->pri; + $newTodo->name = $todo->name; + $newTodo->desc = $todo->desc; + $newTodo->status = 'wait'; + $newTodo->private = $todo->private; + $newTodo->assignedTo = $todo->assignedTo; + $newTodo->assignedBy = $todo->assignedBy; + if($todo->assignedTo) $newTodo->assignedDate = $now; $date = ''; $start = strtotime($begin); diff --git a/module/user/view/login.html.php b/module/user/view/login.html.php index 2d2b2e2422..f7f46d63f0 100644 --- a/module/user/view/login.html.php +++ b/module/user/view/login.html.php @@ -82,7 +82,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
checkVersion):?> - +
From 3561a659c7cd2569cd1c7a09c58f1ba1e6ab2085 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Tue, 25 Sep 2018 13:27:30 +0800 Subject: [PATCH 09/16] * add changelog. --- doc/CHANGELOG | 53 ++++++++++++++++++++++++++++++++++++++ module/misc/lang/en.php | 5 ++++ module/misc/lang/zh-cn.php | 5 ++++ 3 files changed, 63 insertions(+) diff --git a/doc/CHANGELOG b/doc/CHANGELOG index 19092c1b80..1befa3ba9d 100644 --- a/doc/CHANGELOG +++ b/doc/CHANGELOG @@ -1,3 +1,56 @@ +2018-09-25 10.4.stable +完成的需求 +3298 详情页面还原我们之前的排版布局 +3297 恢复浏览器默认的访问过链接的颜色功能 +3296 搜索表单里面下拉菜单的选项不要用灰色 +3295 列表页面的模块名称改用灰色显示 +3172 项目日历的时间线太窄了。 +3191 火狐下面组织视图日志批量选中编辑，页面为空 +3186 重构添加用户页面的表单 +3228 创建文档库库的时候能够根据当前选中的产品或者项目自动选中 +3227 调整创建文档库时的表单宽度 +3253 附件图标显示不正常 +3293 调整整体的行间距 +3292 1280下面屏幕不要出横向的滚动条 +3291 还原页面右上角搜索的逻辑 +3074 用户机器休眠登录失效后，重新刷新session +3119 编辑器不要出横向的滚动条 +3122 操作区域图标分量过重 +3127 垃圾筐图标换成x +3128 模块树缺少联系 +3134 统计区块中，改成横向两行 +3153 没有必要再额外增加小圆点 +3158 去掉前面的首字母 +3166 调整分组视图页面标题的长度 +3167 分组查看页面左侧的分组需求控制在两行显示，统计信息控制在两行 +3168 树状图查看的时候，类型标签不要如此突出 +3169 树状图里面的模块标签去掉 +3177 调整动态信息里面的组织方式 +3180 组织浏览用户的时候部门没有高亮 +3181 组织用户的待办和日志合并成日程 +3183 用户所属的项目的表头对齐方式调整 +3184 用户项目列表默认的排序修改。id字段和项目代号字段的对齐方式调整 +3188 组织用户信息导航菜单不要这样宽 +3189 批量添加用户页面系统登录密码字段缩短 +3190 组织视图日志，菜单没有高亮，工作内容字段太短 +3193 部门组织项目应当有间距 +3194 权限列表页面新增分组也要突出 +3206 去掉中间的线 +3207 检查集成到然之里面的区块排版 +3208 调整集成到然之里面的样式 +3217 文档搜索之后标题做高亮 +3242 bug提交页面点击加载所有用户之后用户下拉无法自动隐藏 +3243 加载所有用户应当突出 +3252 如果用户手工选择了通过，写结果的时候不要更新用例状态 +3255 调整用例的编辑表单前置条件不用那么高表格不要换行 +3256 调整创建测试套件的表单 +3266 测试单关联用例的时候搜索表单需要都出现吗？ +3269 任务列表将其他的视图单独出来一个菜单 +3275 提升现有的接口机制 +3151 调整详情页面操作按钮栏的交互规则 +3150 详情页面返回按钮和上一个下一个偏弱 +3149 黑色的感觉偏重了 + 2018-09-11 10.3.1 修复的Bug 1938 测试-bug，编辑bug，选择所属项目后，解决版本只能选择这个项目下的版本 diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php index 93c3cad352..6d1cbb257b 100644 --- a/module/misc/lang/en.php +++ b/module/misc/lang/en.php @@ -74,6 +74,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = 'Latest Version'; $lang->misc->feature->detailed = 'Details'; +$lang->misc->releaseDate['10.4.stable'] = '2018-09-26'; $lang->misc->releaseDate['10.3.stable'] = '2018-08-10'; $lang->misc->releaseDate['10.2.stable'] = '2018-08-02'; $lang->misc->releaseDate['10.0.stable'] = '2018-06-26'; @@ -91,6 +92,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Optimizing and adjusting new interface', 'desc' => '

Details page restore our previous layout.

Refactoring forms to add user pages

When use cases are executed, do not update the use case state if the user manually chooses to pass through and write the results.

'); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'After the user machine hibernate login fails, the session is refreshed again.', 'desc' => ''); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'Upgrading existing interface mechanisms', 'desc' => ''); + $lang->misc->feature->all['10.3.stable'][] = array('title'=>'Fix Bug.', 'desc' => ''); $lang->misc->feature->all['10.2.stable'][] = array('title'=>'Xuan.im is integrated!', 'desc' => ''); diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php index 9a870cecb2..5b9bd52140 100644 --- a/module/misc/lang/zh-cn.php +++ b/module/misc/lang/zh-cn.php @@ -74,6 +74,7 @@ $lang->misc->feature = new stdclass(); $lang->misc->feature->lastest = '最新版本'; $lang->misc->feature->detailed = '详情'; +$lang->misc->releaseDate['10.4.stable'] = '2018-09-26'; $lang->misc->releaseDate['10.3.stable'] = '2018-08-10'; $lang->misc->releaseDate['10.2.stable'] = '2018-08-02'; $lang->misc->releaseDate['10.0.stable'] = '2018-06-26'; @@ -91,6 +92,10 @@ $lang->misc->releaseDate['7.2.stable'] = '2015-05-22'; $lang->misc->releaseDate['7.1.stable'] = '2015-03-07'; $lang->misc->releaseDate['6.3.stable'] = '2014-11-07'; +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'优化调整新界面', 'desc' => '

详情页面还原我们之前的排版布局

重构添加用户页面的表单

用例执行时，如果用户手工选择了通过，写结果的时候不要更新用例状态

'); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'用户机器休眠登录失效后，重新刷新session', 'desc' => ''); +$lang->misc->feature->all['10.4.stable'][] = array('title'=>'提升现有的接口机制', 'desc' => ''); + $lang->misc->feature->all['10.3.stable'][] = array('title'=>'修复Bug', 'desc' => ''); $lang->misc->feature->all['10.2.stable'][] = array('title'=>'集成喧喧IM', 'desc' => ''); From 330b21b2e317924ee380a6cf4b22848e6e93edd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= Date: Wed, 26 Sep 2018 10:43:23 +0800 Subject: [PATCH 10/16] * Change Copyright Ranzhi to ZenTaoPMS. --- module/block/config.php | 6 +++--- module/block/lang/zh-cn.php | 6 +++--- module/block/view/admin.html.php | 4 ++-- module/block/view/bugblock.html.php | 4 ++-- module/block/view/overviewblock.html.php | 2 +- module/block/view/planblock.html.php | 4 ++-- module/block/view/qaoverviewblock.html.php | 4 ++-- module/block/view/releaseblock.html.php | 4 ++-- module/block/view/setmodule.html.php | 6 +++--- module/block/view/testtaskblock.html.php | 4 ++-- module/block/view/todoblock.html.php | 10 +++++----- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/module/block/config.php b/module/block/config.php index efc0372658..a446c201ca 100644 --- a/module/block/config.php +++ b/module/block/config.php @@ -1,13 +1,13 @@ - * @package block + * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ $config->block = new stdclass(); $config->block->version = 2; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 3449c71af5..6120ae0745 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -1,13 +1,13 @@ - * @package block + * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = '区块'; diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 4ba0f4d1d3..869a26e989 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/overviewblock.html.php b/module/block/view/overviewblock.html.php index b6a9326c5e..66bec1b5fb 100644 --- a/module/block/view/overviewblock.html.php +++ b/module/block/view/overviewblock.html.php @@ -1,6 +1,6 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/qaoverviewblock.html.php b/module/block/view/qaoverviewblock.html.php index 7aade3e58e..347043424e 100644 --- a/module/block/view/qaoverviewblock.html.php +++ b/module/block/view/qaoverviewblock.html.php @@ -1,11 +1,11 @@ - * @package block + * @package block * @version $Id$ * @link http://www.zentao.net */ diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index 95ceab0272..6e8dbbdf5d 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/setmodule.html.php b/module/block/view/setmodule.html.php index a114f0c4e2..98157a0e0a 100644 --- a/module/block/view/setmodule.html.php +++ b/module/block/view/setmodule.html.php @@ -1,13 +1,13 @@ - * @package block + * @package block * @version $Id: html.php 7488 2013-12-26 07:26:10Z zhujinyong $ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 5a84f7afc6..c96ac2d450 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ if(!$selfCall) die(include('./todolist.html.php')); ?> @@ -73,7 +73,7 @@ if(!$selfCall) die(include('./todolist.html.php'));
- +
@@ -124,7 +124,7 @@ if(!$selfCall) die(include('./todolist.html.php')); $block.data('blockTodoes', 1); var $form = $block.find('form'); var $titleInput = $form.find('[name="name"]'); - + var toggleForm = function(toggle) { if(toggle === undefined) @@ -172,7 +172,7 @@ if(!$selfCall) die(include('./todolist.html.php')); var $todoes = $(obj).closest('.block-todoes'); var $form = $(obj).closest('form'); var $name = $form.find("input[name='name']").val(); - if($name == '') + if($name == '') { $("input[name='name']").addClass('has-error'); $('#nameLabel').remove(); From 6357b9173d1db9c1dce85ab3fa141edbe985ef0f Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 26 Sep 2018 10:43:33 +0800 Subject: [PATCH 11/16] * change ranzhi to zentao in Notes. --- module/block/config.php | 4 ++-- module/block/lang/en.php | 20 +++++++++++-------- module/block/lang/zh-cn.php | 20 +++++++++++-------- module/block/lang/zh-tw.php | 4 ++-- module/block/view/admin.html.php | 4 ++-- module/block/view/bugblock.html.php | 4 ++-- module/block/view/buildblock.html.php | 4 ++-- module/block/view/caseblock.html.php | 4 ++-- module/block/view/dashboard.html.php | 4 ++-- module/block/view/listblock.html.php | 4 ++-- module/block/view/main.html.php | 2 +- module/block/view/overviewblock.html.php | 2 +- module/block/view/planblock.html.php | 4 ++-- .../block/view/productoverviewblock.html.php | 2 +- .../block/view/projectoverviewblock.html.php | 2 +- module/block/view/qaoverviewblock.html.php | 2 +- module/block/view/releaseblock.html.php | 4 ++-- module/block/view/set.html.php | 4 ++-- module/block/view/setmodule.html.php | 4 ++-- module/block/view/storyblock.html.php | 4 ++-- module/block/view/taskblock.html.php | 4 ++-- module/block/view/testtaskblock.html.php | 6 +++--- module/block/view/todoblock.html.php | 4 ++-- module/block/view/todolist.html.php | 4 ++-- 24 files changed, 64 insertions(+), 56 deletions(-) diff --git a/module/block/config.php b/module/block/config.php index efc0372658..8e8ea3c6f8 100644 --- a/module/block/config.php +++ b/module/block/config.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ $config->block = new stdclass(); $config->block->version = 2; diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 620e6016fd..4a1542f7d1 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = 'Block'; @@ -367,20 +367,24 @@ $lang->block->typeList->testtask['blocked'] = 'Blocked'; $lang->block->typeList->testtask['done'] = 'Done'; $lang->block->typeList->testtask['all'] = 'All'; -$lang->block->modules['product']->moreLinkList = new stdclass(); +$lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); + +$lang->block->modules['project']->moreLinkList = new stdclass(); $lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; $lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; -$lang->block->modules['qa']->moreLinkList = new stdclass(); + +$lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; $lang->block->modules['qa']->moreLinkList->case = 'my|testcase|type=%s'; $lang->block->modules['qa']->moreLinkList->testtask = 'testtask|browse|type=%s'; -$lang->block->modules['todo']->moreLinkList = new stdclass(); + +$lang->block->modules['todo']->moreLinkList = new stdclass(); $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all'; -$lang->block->modules['common'] = new stdclass(); -$lang->block->modules['common']->moreLinkList = new stdclass(); + +$lang->block->modules['common'] = new stdclass(); +$lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->welcomeList['06:00'] = 'Good morning, %s'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 3449c71af5..0c411207e0 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = '区块'; @@ -367,20 +367,24 @@ $lang->block->typeList->testtask['blocked'] = '阻塞版本'; $lang->block->typeList->testtask['done'] = '已测版本'; $lang->block->typeList->testtask['all'] = '全部'; -$lang->block->modules['product']->moreLinkList = new stdclass(); +$lang->block->modules['product']->moreLinkList = new stdclass(); $lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); + +$lang->block->modules['project']->moreLinkList = new stdclass(); $lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; $lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; -$lang->block->modules['qa']->moreLinkList = new stdclass(); + +$lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; $lang->block->modules['qa']->moreLinkList->case = 'my|testcase|type=%s'; $lang->block->modules['qa']->moreLinkList->testtask = 'testtask|browse|type=%s'; -$lang->block->modules['todo']->moreLinkList = new stdclass(); + +$lang->block->modules['todo']->moreLinkList = new stdclass(); $lang->block->modules['todo']->moreLinkList->list = 'my|todo|type=all'; -$lang->block->modules['common'] = new stdclass(); -$lang->block->modules['common']->moreLinkList = new stdclass(); + +$lang->block->modules['common'] = new stdclass(); +$lang->block->modules['common']->moreLinkList = new stdclass(); $lang->block->modules['common']->moreLinkList->dynamic = 'company|dynamic|'; $lang->block->welcomeList['06:00'] = '%s，早上好！'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 8a4f399770..da1385a104 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ $lang->block = new stdclass(); $lang->block->common = '區塊'; diff --git a/module/block/view/admin.html.php b/module/block/view/admin.html.php index 4ba0f4d1d3..869a26e989 100644 --- a/module/block/view/admin.html.php +++ b/module/block/view/admin.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index 4526c1a3fe..ed71ec61a2 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index cd531ac5d8..5b00e0ce94 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -1,14 +1,14 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/dashboard.html.php b/module/block/view/dashboard.html.php index 5ec91b0e86..3e10f3b097 100644 --- a/module/block/view/dashboard.html.php +++ b/module/block/view/dashboard.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ if($extView = $this->getExtViewFile(__FILE__)){include $extView; return helper::cd();} $webRoot = $config->webRoot; diff --git a/module/block/view/listblock.html.php b/module/block/view/listblock.html.php index 6b24331725..9e9cf211e4 100644 --- a/module/block/view/listblock.html.php +++ b/module/block/view/listblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/main.html.php b/module/block/view/main.html.php index 6e431f437f..0cadfe729d 100644 --- a/module/block/view/main.html.php +++ b/module/block/view/main.html.php @@ -7,7 +7,7 @@ * @author Yidong Wang * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.pms */ $viewDir = dirname(__FILE__); $file2Include = file_exists(dirname($viewDir) . "/ext/view/{$code}block.html.php") ? dirname($viewDir) . "/ext/view/{$code}block.html.php" : "{$viewDir}/{$code}block.html.php"; diff --git a/module/block/view/overviewblock.html.php b/module/block/view/overviewblock.html.php index b6a9326c5e..66bec1b5fb 100644 --- a/module/block/view/overviewblock.html.php +++ b/module/block/view/overviewblock.html.php @@ -1,6 +1,6 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/productoverviewblock.html.php b/module/block/view/productoverviewblock.html.php index 4f72669bfb..637cdddba0 100644 --- a/module/block/view/productoverviewblock.html.php +++ b/module/block/view/productoverviewblock.html.php @@ -1,6 +1,6 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/set.html.php b/module/block/view/set.html.php index 6126c66360..70b92e4475 100644 --- a/module/block/view/set.html.php +++ b/module/block/view/set.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id: html.php 7488 2013-12-26 07:26:10Z zhujinyong $ - * @link http://www.ranzhico.com + * @link http://www.zentao.net */ ?> * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index c23489bc0a..e8c796aeea 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?> diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 178b02a977..b4327a7afb 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -1,20 +1,20 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?>
block->emptyTip;?>
- +
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 5a84f7afc6..c0b4478696 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ if(!$selfCall) die(include('./todolist.html.php')); ?> diff --git a/module/block/view/todolist.html.php b/module/block/view/todolist.html.php index 69c8e6ca09..4738582b66 100644 --- a/module/block/view/todolist.html.php +++ b/module/block/view/todolist.html.php @@ -1,13 +1,13 @@ * @package block * @version $Id$ - * @link http://www.ranzhi.org + * @link http://www.zentao.net */ ?>