Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
This commit is contained in:
caoyanyi
@@ -227,7 +227,7 @@ $config->openMethods[] = 'doc.createbasicinfo';
|
||||
$config->openMethods[] = 'project.createguide';
|
||||
$config->openMethods[] = 'task.editteam';
|
||||
$config->openMethods[] = 'feedback.mergeproductmodule';
|
||||
$config->openMethods[] = 'zanode.nodeList';
|
||||
$config->openMethods[] = 'zanode.nodelist';
|
||||
$config->openMethods[] = 'action.restoreStages';
|
||||
|
||||
$config->openModules = array();
|
||||
|
||||
+3
-3
@@ -11,13 +11,13 @@ Z PUBLIC LICENSE(ZPL) 1.2
|
||||
|
||||
Authorization
|
||||
|
||||
Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by EasyCorp(www.easycorp.ltd).
|
||||
Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by ZenTao Software(www.easycorp.ltd).
|
||||
Anyone can use the agreement to publish open source software, and modify the blank in the following text of the agreement accordingly.
|
||||
No other text of the agreement shall be changed. EasyCorp has the final interpretation of the terms in the agreement.
|
||||
No other text of the agreement shall be changed. ZenTao Software has the final interpretation of the terms in the agreement.
|
||||
|
||||
Preface
|
||||
|
||||
ZenTao ALM (Hereinafter referred to as "the software") developed by EasyCorp (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software.
|
||||
ZenTao ALM (Hereinafter referred to as "the software") developed by ZenTao Software (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software.
|
||||
The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement.
|
||||
By installation of the software, you agree that a contractual relationship between you and me is automatically established.
|
||||
You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional agreement with me.
|
||||
|
||||
+3
-3
@@ -2,13 +2,13 @@ Z PUBLIC LICENSE 1.2
|
||||
|
||||
Authorization
|
||||
|
||||
Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by EasyCorp(www.easycorp.ltd).
|
||||
Z PUBLIC LICENSE, also known as ZPL Agreement, is drafted by ZenTao Software(www.easycorp.ltd).
|
||||
Anyone can use the agreement to publish open source software, and modify the blank in the following text of the agreement accordingly.
|
||||
No other text of the agreement shall be changed. EasyCorp has the final interpretation of the terms in the agreement.
|
||||
No other text of the agreement shall be changed. ZenTao Software has the final interpretation of the terms in the agreement.
|
||||
|
||||
Preface
|
||||
|
||||
ZenTao LITE (Hereinafter referred to as "the software") developed by EasyCorp (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software.
|
||||
ZenTao LITE (Hereinafter referred to as "the software") developed by ZenTao Software (www.easycorp.ltd) (hereinafter referred to I). I'm entitled to all copyright of the software.
|
||||
The software is released as open source software. You are authorized to use the software as long as you are in compliance with this agreement.
|
||||
By installation of the software, you agree that a contractual relationship between you and me is automatically established.
|
||||
You are obliged to fully comply with all the terms of this agreement unless you choose to stop using the software or you have signed additional agreement with me.
|
||||
|
||||
@@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma
|
||||
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao Lite</a>
|
||||
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma
|
||||
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao Lite</a>
|
||||
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@ enterprises. It enables every department and every employee in the company to ma
|
||||
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao Lite is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao Lite</a>
|
||||
|
||||
|
||||
|
||||
@@ -644,8 +644,8 @@ class adminModel extends model
|
||||
*/
|
||||
public function checkInternet()
|
||||
{
|
||||
$timeoutMS = 500;
|
||||
$curl = curl_init();
|
||||
$timeoutMS = 400;
|
||||
$curl = curl_init();
|
||||
curl_setopt($curl, CURLOPT_URL, $this->config->admin->apiSite);
|
||||
curl_setopt($curl, CURLOPT_TIMEOUT_MS, $timeoutMS);
|
||||
curl_setopt($curl, CURLOPT_CONNECTTIMEOUT_MS, $timeoutMS);
|
||||
|
||||
@@ -27,14 +27,14 @@ $lang->install->license = 'ZenTao PMS läuft unter der Z PUBLIC LICENSE
|
||||
$lang->install->desc = <<<EOT
|
||||
ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> or <a href='https://www.gnu.org/licenses/agpl-3.0.en.html' target='_blank'>AGPL</a> License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
|
||||
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
|
||||
|
||||
You are installing ZenTao <strong class='text-danger'>%s</strong>.
|
||||
@@ -293,7 +293,7 @@ EOT;
|
||||
|
||||
$lang->install->product = array('chanzhi', 'zdoo');
|
||||
|
||||
$lang->install->promotion = "Produkte von Nature Easy Soft:";
|
||||
$lang->install->promotion = "Produkte von Nature ZenTao Software:";
|
||||
|
||||
$lang->install->chanzhi = new stdclass();
|
||||
$lang->install->chanzhi->name = 'ZSITE';
|
||||
|
||||
@@ -27,14 +27,14 @@ $lang->install->license = 'License';
|
||||
$lang->install->desc = <<<EOT
|
||||
ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> or <a href='https://www.gnu.org/licenses/agpl-3.0.en.html' target='_blank'>AGPL</a> License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
|
||||
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
|
||||
|
||||
You are installing ZenTao <strong class='text-danger'>%s</strong>.
|
||||
@@ -293,7 +293,7 @@ EOT;
|
||||
|
||||
$lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot');
|
||||
|
||||
$lang->install->promotion = "Products also from EasyCorp:";
|
||||
$lang->install->promotion = "Products also from ZenTao Software:";
|
||||
|
||||
$lang->install->chanzhi = new stdclass();
|
||||
$lang->install->chanzhi->name = 'ZSITE';
|
||||
|
||||
@@ -27,14 +27,14 @@ $lang->install->license = 'ZenTao est sous Z PUBLIC LICENSE(ZPL) 1.2';
|
||||
$lang->install->desc = <<<EOT
|
||||
ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>ZPL</a> or <a href='https://www.gnu.org/licenses/agpl-3.0.en.html' target='_blank'>AGPL</a> License. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
|
||||
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
|
||||
|
||||
You are installing ZenTao <strong class='text-danger'>%s</strong>.
|
||||
@@ -293,7 +293,7 @@ EOT;
|
||||
|
||||
$lang->install->product = array('chanzhi', 'zdoo');
|
||||
|
||||
$lang->install->promotion = "Autres produits de l'équipe Nature Easy Soft :";
|
||||
$lang->install->promotion = "Autres produits de l'équipe Nature ZenTao Software :";
|
||||
|
||||
$lang->install->chanzhi = new stdclass();
|
||||
$lang->install->chanzhi->name = 'ZSITE';
|
||||
|
||||
@@ -27,14 +27,14 @@ $lang->install->license = 'ZenTao is under Z PUBLIC LICENSE(ZPL) 1.2';
|
||||
$lang->install->desc = <<<EOT
|
||||
ZenTao ALM is an open source software released under <a href='http://zpl.pub/page/zplv12.html' target='_blank'>Z Public License</a>. It integrates with Product Management, Project Management, Test Management, Document Management, CI Management, etc. ZenTao is a perfect choice for managing software development projects.
|
||||
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by EasyCorp. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
ZenTao ALM is built on PHP + MySQL + zentaoPHP which is an independent framework developed by ZenTao Software. Third-party developers/organizations can develop extensions or customize ZenTao accordingly.
|
||||
EOT;
|
||||
$lang->install->links = <<<EOT
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>EasyCorp</a></strong>.
|
||||
ZenTao ALM is developed by <strong><a href='https://en.easysoft.ltd' target='_blank' class='text-danger'>ZenTao Software</a></strong>.
|
||||
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>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>EasyCorp</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>EasyCorp</a>
|
||||
LinkedIn: <a href='https://www.linkedin.com/company/1156596/' target='_blank'>ZenTao Software</a>
|
||||
Facebook: <a href='https://www.facebook.com/natureeasysoft' target='_blank'>ZenTao Software</a>
|
||||
Twitter: <a href='https://twitter.com/ZentaoA' target='_blank'>ZenTao ALM</a>
|
||||
|
||||
You are installing ZenTao <strong class='text-danger'>%s</strong>.
|
||||
@@ -182,7 +182,7 @@ EOT;
|
||||
|
||||
$lang->install->product = array('chanzhi', 'zdoo', 'ydisk', 'meshiot');
|
||||
|
||||
$lang->install->promotion = "Sản phẩm từ EasyCorp:";
|
||||
$lang->install->promotion = "Sản phẩm từ ZenTao Software:";
|
||||
|
||||
$lang->install->chanzhi = new stdclass();
|
||||
$lang->install->chanzhi->name = 'ZSITE';
|
||||
|
||||
@@ -21,7 +21,7 @@ $lang->misc->zentao->labels['about'] = 'About ZenTao';
|
||||
$lang->misc->zentao->labels['support'] = 'Tech Support';
|
||||
$lang->misc->zentao->labels['cowin'] = 'Help Us';
|
||||
$lang->misc->zentao->labels['service'] = 'Service';
|
||||
$lang->misc->zentao->labels['others'] = 'From EasyCorp';
|
||||
$lang->misc->zentao->labels['others'] = 'From ZenTao Software';
|
||||
|
||||
$lang->misc->zentao->icons['about'] = 'group';
|
||||
$lang->misc->zentao->icons['support'] = 'question-sign';
|
||||
@@ -59,7 +59,7 @@ $lang->misc->zentao->others['meshiot' ] = "<img src='{$config->webRoot}theme/def
|
||||
|
||||
$lang->misc->mobile = "Mobile Access";
|
||||
$lang->misc->noGDLib = "Please visit <strong>%s</strong> in the browser of your phone.";
|
||||
$lang->misc->copyright = "© 2009 - " . date('Y') . " <a href='https://easycorp.ltd/' target='_blank'>EasyCorp</a> Email <a href='mailto:Renee@easycorp.ltd'>Renee@easycorp.ltd</a>";
|
||||
$lang->misc->copyright = "© 2009 - " . date('Y') . " <a href='https://easycorp.ltd/' target='_blank'>ZenTao Software</a> Email <a href='mailto:Renee@easycorp.ltd'>Renee@easycorp.ltd</a>";
|
||||
$lang->misc->checkTable = "Check Data Table";
|
||||
$lang->misc->needRepair = "Repair Table";
|
||||
$lang->misc->repairTable = "Database table might be damaged due to power outage. Please check and repair!";
|
||||
|
||||
@@ -2,7 +2,7 @@ function changeParentStage(stageID)
|
||||
{
|
||||
$.get(createLink('programplan', 'ajaxGetAttribute', 'stageID=' + stageID + '&attribute=' + plan.attribute), function(attribute)
|
||||
{
|
||||
$('#attributeType th + td').html(attribute);
|
||||
$('#attributeType td:first').html(attribute);
|
||||
$("#attribute" + "_chosen").remove();
|
||||
$("#attribute").next('.picker').remove();
|
||||
$("#attribute").chosen();
|
||||
|
||||
@@ -1046,7 +1046,7 @@ class programplanModel extends model
|
||||
|
||||
$this->dao->update(TABLE_PROJECT)->set('path')->eq($path['path'])->set('grade')->eq($path['grade'])->where('id')->eq($stage->id)->exec();
|
||||
|
||||
if(count($children) > 0)
|
||||
if(!empty($children))
|
||||
{
|
||||
foreach($children as $id => $child) $this->setTreePath($id);
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; alig
|
||||
td.c-name > .project-type-label {flex: 0 0 36px; padding-right: 2px;}
|
||||
.c-name > a, .table-children .text-left > a, .c-name > span.text-ellipsis { padding-left: 5px; text-overflow: clip;}
|
||||
span.table-nest-icon.table-nest-toggle {min-width: 22px; max-width: 22px;}
|
||||
span.table-nest-icon {padding-left: 22px;}
|
||||
#projectForm .c-name, #executionTableList .c-name, #programTableList .c-name {padding-right:47px;}
|
||||
#mainMenu .pull-left > .btn-group > a > .text{overflow: hidden;display: block;}
|
||||
#mainMenu .pull-right .icon-list{padding-left: 7px;}
|
||||
|
||||
@@ -619,7 +619,7 @@ $(document).on('click', '#testStory_chosen', function()
|
||||
|
||||
$('#modalTeam tfoot .btn').click(function()
|
||||
{
|
||||
var team = '';
|
||||
var team = [];
|
||||
var time = 0;
|
||||
var error = false;
|
||||
var mode = $('[name="mode"]').val();
|
||||
@@ -630,7 +630,7 @@ $('#modalTeam tfoot .btn').click(function()
|
||||
|
||||
var tr = $(this).closest('tr');
|
||||
var account = $(this).find('option:selected').text();
|
||||
team += ' ' + account;
|
||||
if(!team.includes(account)) team.push(account);
|
||||
|
||||
estimate = parseFloat($(this).parents('td').next('td').find('[name^=teamEstimate]').val());
|
||||
if(!isNaN(estimate) && estimate > 0) time += estimate;
|
||||
@@ -643,8 +643,7 @@ $('#modalTeam tfoot .btn').click(function()
|
||||
});
|
||||
|
||||
if(error) return false;
|
||||
var teamList = team.split(" ");
|
||||
if(teamList.length <= 2)
|
||||
if(team.length < 2)
|
||||
{
|
||||
bootbox.alert(teamMemberError);
|
||||
return false;
|
||||
|
||||
@@ -26,6 +26,13 @@
|
||||
</div>
|
||||
<div class="cell show" id="queryBox" data-module='testsuite'></div>
|
||||
<div id='mainContent'>
|
||||
<?php if(empty($cases)):?>
|
||||
<div class="table-empty-tip">
|
||||
<p>
|
||||
<span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
|
||||
</p>
|
||||
</div>
|
||||
<?php else:?>
|
||||
<form class='main-table table-testcase' data-ride='table' method='post'>
|
||||
<div class="table-header">
|
||||
<i class="icon-unlink"></i> <strong><?php echo $lang->testsuite->unlinkedCases;?></strong> (<?php echo $pager->recTotal;?>)
|
||||
@@ -87,5 +94,6 @@
|
||||
</div>
|
||||
<?php endif;?>
|
||||
</form>
|
||||
<?php endif;?>
|
||||
</div>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -7064,6 +7064,8 @@ class upgradeModel extends model
|
||||
foreach($labels as $method => $label)
|
||||
{
|
||||
$workflowAction = $this->dao->select('*')->from(TABLE_WORKFLOWACTION)->where('module')->eq($module)->andWhere('action')->eq($method)->fetch();
|
||||
if(!$workflowAction) continue;
|
||||
|
||||
unset($workflowAction->id);
|
||||
$workflowAction->vision = $workflowAction->vision == 'lite' ? 'rnd' : 'lite';
|
||||
$this->dao->replace(TABLE_WORKFLOWACTION)->data($workflowAction)->exec();
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
$lang->zanode->common = 'ZenAgent Node';
|
||||
$lang->zanode->browse = 'ZenAgent Node List';
|
||||
$lang->zanode->nodeList = 'ZenAgent Node List';
|
||||
$lang->zanode->create = 'Create ZenAgent Node';
|
||||
$lang->zanode->edit = 'Edit ZenAgent Node';
|
||||
$lang->zanode->editAction = 'Edit ZenAgent Node';
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
$lang->zanode->common = 'ZenAgent Node';
|
||||
$lang->zanode->browse = 'ZenAgent Node List';
|
||||
$lang->zanode->nodeList = 'ZenAgent Node List';
|
||||
$lang->zanode->create = 'Create ZenAgent Node';
|
||||
$lang->zanode->edit = 'Edit ZenAgent Node';
|
||||
$lang->zanode->editAction = 'Edit ZenAgent Node';
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
$lang->zanode->common = 'ZenAgent Node';
|
||||
$lang->zanode->browse = 'ZenAgent Node List';
|
||||
$lang->zanode->nodeList = 'ZenAgent Node List';
|
||||
$lang->zanode->create = 'Create ZenAgent Node';
|
||||
$lang->zanode->edit = 'Edit ZenAgent Node';
|
||||
$lang->zanode->editAction = 'Edit ZenAgent Node';
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?php
|
||||
$lang->zanode->common = '执行节点';
|
||||
$lang->zanode->browse = '执行节点列表';
|
||||
$lang->zanode->nodeList = '执行节点列表';
|
||||
$lang->zanode->create = '创建执行节点';
|
||||
$lang->zanode->edit = '编辑执行节点';
|
||||
$lang->zanode->editAction = '编辑执行节点';
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
<tr>
|
||||
<th class='c-id'><?php common::printOrderLink('t1.id', $orderBy, $vars, $lang->idAB); ?></th>
|
||||
<th class='c-name'><?php common::printOrderLink('t1.name', $orderBy, $vars, $lang->zanode->name); ?></th>
|
||||
<th class='c-type'><?php common::printOrderLink('t1.type', $orderBy, $vars, $lang->zahost->type); ?></th>
|
||||
<th class='c-type hidden'><?php common::printOrderLink('t1.type', $orderBy, $vars, $lang->zahost->type); ?></th>
|
||||
<th class='c-ip'><?php common::printOrderLink('t1.extranet', $orderBy, $vars, $lang->zanode->extranet); ?></th>
|
||||
<th class='c-cpu'><?php common::printOrderLink('t1.cpuCores', $orderBy, $vars, $lang->zanode->cpuCores); ?></th>
|
||||
<th class='c-memory'><?php common::printOrderLink('t1.memory', $orderBy, $vars, $lang->zanode->memory); ?></th>
|
||||
@@ -69,7 +69,7 @@
|
||||
<tr>
|
||||
<td><?php echo $node->id; ?></td>
|
||||
<td title='<?php echo $node->name ?>'><?php echo html::a($this->inlink('view', "id=$node->id"), $node->name, '', ""); ?></td>
|
||||
<td><?php echo zget($this->lang->zanode->typeList, $node->type); ?></td>
|
||||
<td class='hidden'><?php echo zget($this->lang->zanode->typeList, $node->type); ?></td>
|
||||
<td><?php echo $node->extranet; ?></td>
|
||||
<td><?php echo zget($config->zanode->os->cpuCores, $node->cpuCores); ?></td>
|
||||
<td><?php echo $node->memory . $this->lang->zahost->unitList['GB']; ?></td>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
</div>
|
||||
<form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
|
||||
<table class='table table-form'>
|
||||
<tr>
|
||||
<tr class='hidden'>
|
||||
<th><?php echo $lang->zahost->type;?></th>
|
||||
<td><?php echo html::select('type', $lang->zanode->typeList, 'virtual', "class='form-control chosen' onchange='zahostType()'")?></td>
|
||||
<td></td>
|
||||
|
||||
Reference in New Issue
Block a user