* change http to https.
This commit is contained in:
@@ -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 = "<strong>%s-%s</strong> of <strong>%s</strong>.";
|
||||
|
||||
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>ZenTao Pro <i class='text-danger icon-pro-version'></i></a> ";
|
||||
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>ZenTao Pro <i class='text-danger icon-pro-version'></i></a> ";
|
||||
$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 <font color=red>sohusin.post.max_vars</font> and <font color=red>sohusin.request.max_vars</font> (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 <font color=red>max_input_vars</font> (set larger %s value) in php.ini, then save and restart Apache or php-fpm, or some data will not be saved.";
|
||||
|
||||
@@ -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 = "第 <strong>%s-%s</strong> 项,共 <strong>%s</strong> 项";
|
||||
|
||||
$lang->proVersion = "<a href='http://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>专业版 <i class='text-danger icon-pro-version'></i></a> ";
|
||||
$lang->proVersion = "<a href='https://api.zentao.net/goto.php?item=proversion&from=footer' target='_blank' id='proLink' class='text-important'>专业版 <i class='text-danger icon-pro-version'></i></a> ";
|
||||
$lang->downNotify = "下载桌面提醒";
|
||||
$lang->website = "http://www.zentao.net";
|
||||
$lang->website = "https://www.zentao.net";
|
||||
|
||||
$lang->suhosinInfo = "警告:数据太多,请在php.ini中修改<font color=red>sohusin.post.max_vars</font>和<font color=red>sohusin.request.max_vars</font>(大于%s的数)。 保存并重新启动apache或php-fpm,否则会造成部分数据无法保存。";
|
||||
$lang->maxVarsInfo = "警告:数据太多,请在php.ini中修改<font color=red>max_input_vars</font>(大于%s的数)。 保存并重新启动apache或php-fpm,否则会造成部分数据无法保存。";
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<?php
|
||||
$config->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');
|
||||
|
||||
@@ -38,7 +38,7 @@ $lang->extension->dirs = 'Directories';
|
||||
$lang->extension->files = 'Files';
|
||||
$lang->extension->status = 'Status';
|
||||
$lang->extension->version = 'Version';
|
||||
$lang->extension->latest = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>,need zentao <a href="http://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
|
||||
$lang->extension->latest = '<small>Latest:<strong><a href="%s" target="_blank" class="extension">%s</a></strong>,need zentao <a href="https://api.zentao.net/goto.php?item=latest" target="_blank"><strong>%s</strong></small>';
|
||||
$lang->extension->author = 'Author';
|
||||
$lang->extension->license = 'License';
|
||||
$lang->extension->site = 'Website';
|
||||
|
||||
@@ -38,7 +38,7 @@ $lang->extension->dirs = '安装目录';
|
||||
$lang->extension->files = '安装文件';
|
||||
$lang->extension->status = '状态';
|
||||
$lang->extension->version = '版本';
|
||||
$lang->extension->latest = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>,兼容禅道<a href="http://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
|
||||
$lang->extension->latest = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>,兼容禅道<a href="https://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
|
||||
$lang->extension->author = '作者';
|
||||
$lang->extension->license = '授权';
|
||||
$lang->extension->site = '官网';
|
||||
|
||||
@@ -38,7 +38,7 @@ $lang->extension->dirs = '安裝目錄';
|
||||
$lang->extension->files = '安裝檔案';
|
||||
$lang->extension->status = '狀態';
|
||||
$lang->extension->version = '版本';
|
||||
$lang->extension->latest = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>,兼容禪道<a href="http://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
|
||||
$lang->extension->latest = '<small>最新版本<strong><a href="%s" target="_blank" class="extension">%s</a></strong>,兼容禪道<a href="https://api.zentao.net/goto.php?item=latest" target="_blank" class="alert-link"><strong>%s</strong></a></small>';
|
||||
$lang->extension->author = '作者';
|
||||
$lang->extension->license = '授權';
|
||||
$lang->extension->site = '官網';
|
||||
|
||||
@@ -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));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -31,8 +31,8 @@ ZenTao PMS is built on PHP + MySQL and based on ZenTaoPHP framework, an independ
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao PMS is developed by <strong><a href='http://easysoft.ltd' target='_blank' class='text-danger'>Nature Easy Soft Co., LTD</a></strong>.
|
||||
Official Website : <a href='http://www.zentao.pm' target='_blank'>http://www.zentao.pm</a>
|
||||
Technical Support : <a href='http://www.zentao.pm/forum/' target='_blank'>http://www.zentao.pm/forum/</a>
|
||||
Official Website : <a href='https://www.zentao.pm' target='_blank'>https://www.zentao.pm</a>
|
||||
Technical Support : <a href='https://www.zentao.pm/forum/' target='_blank'>https://www.zentao.pm/forum/</a>
|
||||
WhatsApp Group : <a href='https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF' target='_blank'>https://chat.whatsapp.com/B6pi6b3gv0S7x7jqMxwhbF</a>
|
||||
Twitter: <a href='https://twitter.com/cneasysoft' target='_blank'>cneasysoft</a>
|
||||
|
||||
@@ -168,7 +168,7 @@ $lang->install->login = 'Login ZenTao';
|
||||
$lang->install->register = 'Register in ZenTao';
|
||||
|
||||
$lang->install->joinZentao = <<<EOT
|
||||
<p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='http://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
|
||||
<p>You have installed ZenTao %s.<strong class='text-danger'> Please delete install.php asap</strong>.</p><p>Note: In order to get the latest news of ZenTao, please register in ZenTao(<a href='https://www.zentao.pm' class='alert-link' target='_blank'>www.zentao.pm</a>).</p>
|
||||
EOT;
|
||||
|
||||
$lang->install->product = array('chanzhi', 'ranzhi');
|
||||
|
||||
@@ -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 = <<<EOT
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
禅道项目管理软件由<strong><a href='http://www.cnezsoft.com' target='_blank' class='text-danger'>青岛易软天创网络科技有限公司</a>开发</strong>。
|
||||
官方网站:<a href='http://www.zentao.net' target='_blank'>http://www.zentao.net</a>
|
||||
技术支持:<a href='http://www.zentao.net/ask/' target='_blank'>http://www.zentao.net/ask/</a>
|
||||
官方网站:<a href='https://www.zentao.net' target='_blank'>https://www.zentao.net</a>
|
||||
技术支持:<a href='https://www.zentao.net/ask/' target='_blank'>https://www.zentao.net/ask/</a>
|
||||
新浪微博:<a href='http://weibo.com/easysoft' target='_blank'>http://weibo.com/easysoft</a>
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ $lang->install->login = '登录禅道管理系统';
|
||||
$lang->install->register = '禅道社区注册';
|
||||
|
||||
$lang->install->joinZentao = <<<EOT
|
||||
<p>您已经成功安装禅道管理系统%s,<strong class='text-danger'>请及时删除install.php</strong>。</p><p>友情提示:为了您及时获得禅道的最新动态,请在禅道社区(<a href='http://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)进行登记。</p>
|
||||
<p>您已经成功安装禅道管理系统%s,<strong class='text-danger'>请及时删除install.php</strong>。</p><p>友情提示:为了您及时获得禅道的最新动态,请在禅道社区(<a href='https://www.zentao.net' class='alert-link' target='_blank'>www.zentao.net</a>)进行登记。</p>
|
||||
EOT;
|
||||
|
||||
$lang->install->product = array('chanzhi', 'ranzhi', 'xuanxuan');
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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 = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>Help</a>";
|
||||
$lang->my->home->help = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>Help</a>";
|
||||
$lang->my->home->noProductsTip = "No {$lang->productCommon} found here.";
|
||||
|
||||
$lang->my->form = new stdclass();
|
||||
|
||||
@@ -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 = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
|
||||
$lang->my->home->help = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>帮助文档</a>";
|
||||
$lang->my->home->noProductsTip = "这里还没有{$lang->productCommon}。";
|
||||
|
||||
$lang->my->form = new stdclass();
|
||||
|
||||
@@ -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 = "<a href='http://www.zentao.net/help-read-79236.html' target='_blank'>幫助文檔</a>";
|
||||
$lang->my->home->help = "<a href='https://www.zentao.net/help-read-79236.html' target='_blank'>幫助文檔</a>";
|
||||
$lang->my->home->noProductsTip = "這裡還沒有{$lang->productCommon}。";
|
||||
|
||||
$lang->my->form = new stdclass();
|
||||
|
||||
@@ -205,7 +205,7 @@ $lang->project->timeSummary = '<div class="table-col"><div class="clearfix s
|
||||
$lang->project->groupSummaryAB = "<div>Tasks <strong>%s :</strong><span class='text-muted'>Wait</span> %s <span class='text-muted'>Doing</span> %s</div><div>Est. <strong>%s :</strong><span class='text-muted'>Cost</span> %s <span class='text-muted'>Left</span> %s</div>";
|
||||
$lang->project->wbs = "Decompose Tasks";
|
||||
$lang->project->batchWBS = "Batch Decompose";
|
||||
$lang->project->howToUpdateBurn = "<a href='http://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
|
||||
$lang->project->howToUpdateBurn = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='How to Update the Burndown Chart?' class='btn btn-link'>Help <i class='icon icon-help'></i></a>";
|
||||
$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 <a href='%s'> Link Story</a>。";
|
||||
$lang->project->haveDraft = "There are %s draft stories can't be linked.";
|
||||
|
||||
@@ -205,7 +205,7 @@ $lang->project->timeSummary = '<div class="table-col"><div class="clearfix s
|
||||
$lang->project->groupSummaryAB = "<div>总任务 <strong>%s : </strong><span class='text-muted'>未开始</span> %s <span class='text-muted'>进行中</span> %s</div><div>总预计 <strong>%s : </strong><span class='text-muted'>已消耗</span> %s <span class='text-muted'>剩余</span> %s</div>";
|
||||
$lang->project->wbs = "分解任务";
|
||||
$lang->project->batchWBS = "批量分解";
|
||||
$lang->project->howToUpdateBurn = "<a href='http://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图?' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
|
||||
$lang->project->howToUpdateBurn = "<a href='https://api.zentao.net/goto.php?item=burndown&lang=zh-cn' target='_blank' title='如何更新燃尽图?' class='btn btn-link'>帮助 <i class='icon icon-help'></i></a>";
|
||||
$lang->project->whyNoStories = "看起来没有需求可以关联。请检查下{$lang->projectCommon}关联的{$lang->productCommon}中有没有需求,而且要确保它们已经审核通过。";
|
||||
$lang->project->productStories = "{$lang->projectCommon}关联的需求是{$lang->productCommon}需求的子集,并且只有评审通过的需求才能关联。请<a href='%s'>关联需求</a>。";
|
||||
$lang->project->haveDraft = "有%s条草稿状态的需求无法关联到该{$lang->projectCommon}";
|
||||
|
||||
@@ -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 = '<a href="http://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
|
||||
$lang->report->proVersion = '<a href="https://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
|
||||
$lang->report->proVersionEn = '<a href="http://api.zentao.pm/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
|
||||
|
||||
@@ -99,5 +99,5 @@ $lang->report->mailTitle->task = " 任务(%s),";
|
||||
$lang->report->mailTitle->todo = " 待办(%s),";
|
||||
$lang->report->mailTitle->testTask = " 测试版本(%s),";
|
||||
|
||||
$lang->report->proVersion = '<a href="http://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩,尽在专业版!</a>';
|
||||
$lang->report->proVersion = '<a href="https://api.zentao.net/goto.php?item=proversion&from=reportpage" target="_blank">更多精彩,尽在专业版!</a>';
|
||||
$lang->report->proVersionEn = '<a href="http://api.zentao.pm/goto.php?item=proversion&from=reportpage" target="_blank">Try ZenTao Pro for more!</a>';
|
||||
|
||||
@@ -59,7 +59,7 @@ $lang->testreport->caseSummary = ' <strong>%s</strong> cases in Total : <stro
|
||||
$lang->testreport->buildSummary = 'Tested <strong>%s</strong> 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 <a href='http://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
|
||||
$lang->testreport->exportNotice = "Export By <a href='https://www.zentao.net' target='_blank' style='color:grey'>ZenTaoPMS</a>";
|
||||
$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.";
|
||||
|
||||
@@ -59,7 +59,7 @@ $lang->testreport->caseSummary = '共有<strong>%s</strong>个用例,共执
|
||||
$lang->testreport->buildSummary = '共测试了<strong>%s</strong>个版本。';
|
||||
$lang->testreport->confirmDelete = '是否删除该报告?';
|
||||
$lang->testreport->moreNotice = '更多功能可以参考禅道扩展机制进行扩展,也可以联系我们进行定制。';
|
||||
$lang->testreport->exportNotice = "由<a href='http://www.zentao.net' target='_blank' style='color:grey'>禅道项目管理软件</a>导出";
|
||||
$lang->testreport->exportNotice = "由<a href='https://www.zentao.net' target='_blank' style='color:grey'>禅道项目管理软件</a>导出";
|
||||
$lang->testreport->noReport = "报表还没有生成,请稍候查看。";
|
||||
$lang->testreport->foundBugTip = "影响版本在测试轮次内,并且创建时间在测试时间范围内产生的Bug数。";
|
||||
$lang->testreport->legacyBugTip = "Bug状态是激活,或Bug的解决时间在测试结束时间之后。";
|
||||
|
||||
+14
-10
@@ -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);
|
||||
|
||||
@@ -82,7 +82,7 @@ if(empty($config->notMd5Pwd))js::import($jsRoot . 'md5.js');
|
||||
<div class="table-col text-middle text-center">
|
||||
<div id="poweredby">
|
||||
<?php if($config->checkVersion):?>
|
||||
<?php $siteURL = 'http://api.zentao.net';?>
|
||||
<?php $siteURL = 'https://api.zentao.net';?>
|
||||
<iframe id='updater' class='hidden' frameborder='0' width='100%' scrolling='no' allowtransparency='true' src="<?php echo $siteURL;?>/updater-isLatest-<?php echo $config->version;?>-<?php echo $s;?>.html?lang=<?php echo str_replace('-', '_', $this->app->getClientLang())?>"></iframe>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user