diff --git a/module/common/model.php b/module/common/model.php
index cd339bc545..504f4c49a8 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -3204,7 +3204,7 @@ EOD;
* @access public
* @return string
*/
- public static function http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST')
+ public static function http($url, $data = null, $options = array(), $headers = array(), $dataType = 'data', $method = 'POST', $timeout = 30)
{
global $lang, $app;
if(!extension_loaded('curl'))
@@ -3226,8 +3226,8 @@ EOD;
$curl = curl_init();
curl_setopt($curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
curl_setopt($curl, CURLOPT_USERAGENT, 'Sae T OAuth2 v0.1');
- curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 30);
- curl_setopt($curl, CURLOPT_TIMEOUT, 30);
+ curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, $timeout);
+ curl_setopt($curl, CURLOPT_TIMEOUT, $timeout);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($curl, CURLOPT_ENCODING, "");
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, FALSE);
diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index 6e338cdc44..fde20ab715 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -279,18 +279,18 @@ if($isCustomExport)
| file->extension;?> |
- exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control"');?> |
+ exportFileTypeList, '', 'onchange=switchEncode(this.value) class="form-control chosen"');?> |
| file->encoding;?> |
- charsets[$this->cookie->lang], 'utf-8', key($lang->exportFileTypeList) == 'csv' ? "class='form-control'" : "class='form-control'");?> |
+ charsets[$this->cookie->lang], 'utf-8', "class='form-control chosen'");?> |
>
| file->exportRange;?> |
exportTypeList['selected']);?>
- exportTypeList, 'all', "class='form-control'");?>
+ exportTypeList, 'all', "class='form-control chosen'");?>
|
$lang->file->batchExport), '', "onclick='setPart(this);'");?>
diff --git a/module/repo/js/diff.js b/module/repo/js/diff.js
index e1e7d2b26d..8c9c22dcb6 100644
--- a/module/repo/js/diff.js
+++ b/module/repo/js/diff.js
@@ -83,10 +83,11 @@ function createTab(filename, filepath)
$('[data-path="' + decodeURIComponent(filepath) + '"]').closest('li').addClass('selected');
var tabID = Base64.encode(filepath).replaceAll('=', '-');
return {
- title: filename,
- id: tabID,
- type: 'iframe',
- url: createLink('repo', 'ajaxGetDiffEditorContent', urlParams.replace('%s', Base64.encode(encodeURIComponent(filepath))))
+ id: tabID,
+ url: createLink('repo', 'ajaxGetDiffEditorContent', urlParams.replace('%s', Base64.encode(encodeURIComponent(filepath)))),
+ type: 'iframe',
+ title: filename,
+ forbidClose: isonlybody
};
}
@@ -105,6 +106,7 @@ $(document).ready(function()
$('.btn-left').click(function() {arrowTabs('fileTabs', 1);});
$('.btn-right').click(function() {arrowTabs('fileTabs', -2);});
if(file) $('#fileTabs').tabs({tabs: [createTab(file['basename'], entry)]});
+ if(isonlybody) $('#fileTabs .tab-nav-item .tab-nav-close').hide();
/**
* Set pane height.
diff --git a/module/repo/js/monaco.js b/module/repo/js/monaco.js
index 0ec0979c98..26df5dd680 100644
--- a/module/repo/js/monaco.js
+++ b/module/repo/js/monaco.js
@@ -11,10 +11,11 @@ function createTab(filename, filepath)
$('[data-path="' + decodeURIComponent(filepath) + '"]').closest('li').addClass('selected');
var tabID = Base64.encode(filepath).replaceAll('=', '-');
return {
- title: filename,
- id: tabID,
- type: 'iframe',
- url: createLink('repo', 'ajaxGetEditorContent', urlParams.replace('%s', Base64.encode(encodeURIComponent(filepath))))
+ id: tabID,
+ url: createLink('repo', 'ajaxGetEditorContent', urlParams.replace('%s', Base64.encode(encodeURIComponent(filepath)))),
+ type: 'iframe',
+ title: filename,
+ forbidClose: isonlybody
};
}
@@ -23,6 +24,7 @@ $(function()
$('.btn-left').click(function() {arrowTabs('fileTabs', 1);});
$('.btn-right').click(function() {arrowTabs('fileTabs', -2);});
$('#fileTabs').tabs({tabs: [createTab(file['basename'], entry)]});
+ if(isonlybody) $('#fileTabs .tab-nav-item .tab-nav-close').hide();
/**
* Set pane height.
diff --git a/module/repo/view/diffeditor.html.php b/module/repo/view/diffeditor.html.php
index 1b147d8f64..36241af861 100644
--- a/module/repo/view/diffeditor.html.php
+++ b/module/repo/view/diffeditor.html.php
@@ -10,6 +10,7 @@ js::set('diffs', $diffs);
js::set('file', $file);
js::set('entry', $entry);
js::set('openedFiles', array($entry));
+js::set('isonlybody', isonlybody());
js::set('urlParams', "repoID=$repoID&objectID=$objectID&entry=%s&oldRevision=$oldRevision&newRevision=$newRevision&showBug=$showBug&encoding=$encoding");
?>
diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index f549488e83..a8ba9edb7d 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -98,26 +98,30 @@ class tutorialModel extends model
{
$product = $this->getProduct();
$product->stories = array();
- $product->stories[0] = '';
- $product->stories[1] = 'draft';
- $product->stories[2] = 'reviewing';
- $product->stories[3] = 'active';
- $product->stories[4] = 'closed';
- $product->stories[5] = 'changing';
- $product->stories[''] = 0;
- $product->stories['draft'] = 0;
- $product->stories['reviewing'] = 0;
- $product->stories['active'] = 0;
- $product->stories['closed'] = 0;
- $product->stories['changing'] = 0;
- $product->requirements = $product->stories;
- $product->plans = 0;
- $product->releases = 0;
- $product->bugs = 0;
- $product->unResolved = 0;
- $product->closedBugs = 0;
- $product->fixedBugs = 0;
- $product->assignToNull = 0;
+ $product->stories[0] = '';
+ $product->stories[1] = 'draft';
+ $product->stories[2] = 'reviewing';
+ $product->stories[3] = 'active';
+ $product->stories[4] = 'closed';
+ $product->stories[5] = 'changing';
+ $product->stories[6] = 'finishClosed';
+ $product->stories[7] = 'unclosed';
+ $product->stories[''] = 0;
+ $product->stories['draft'] = 0;
+ $product->stories['reviewing'] = 0;
+ $product->stories['active'] = 0;
+ $product->stories['closed'] = 0;
+ $product->stories['changing'] = 0;
+ $product->stories['finishClosed'] = 0;
+ $product->stories['unclosed'] = 0;
+ $product->requirements = $product->stories;
+ $product->plans = 0;
+ $product->releases = 0;
+ $product->bugs = 0;
+ $product->unResolved = 0;
+ $product->closedBugs = 0;
+ $product->fixedBugs = 0;
+ $product->assignToNull = 0;
$productStat[$product->program][$product->line]['products'][$product->id] = $product;
return $productStat;
diff --git a/module/zahost/view/view.html.php b/module/zahost/view/view.html.php
index e6377146c4..75aaadf86c 100644
--- a/module/zahost/view/view.html.php
+++ b/module/zahost/view/view.html.php
@@ -149,7 +149,7 @@
|
- | createLink('zanode', 'view', "id=$node->id"), $node->name, '', "");?> |
+ createLink('zanode', 'view', "id=$node->id"), $node->name, '_target', "");?> |
zanode->os->cpuCores, $node->cpuCores);?> |
memory . $this->lang->zahost->unitList['GB'];?> |
diskSize . $this->lang->zahost->unitList['GB'];?> |
diff --git a/module/zanode/js/view.js b/module/zanode/js/view.js
index f4d5a35e7b..a9cbf8ef93 100644
--- a/module/zanode/js/view.js
+++ b/module/zanode/js/view.js
@@ -29,7 +29,7 @@ function checkServiceStatus(){
if(resultData.data[key] == 'ready' || resultData.data[key] == 'not_available')
{
$('.ztf-status').text(zanodeLang.init[resultData.data[key]])
- $('.ztf-install').text(zanodeLang.reinstall);
+ $('.ztf-install').text('');
}
else
{
diff --git a/module/zanode/model.php b/module/zanode/model.php
index 7e03759651..896945b79c 100644
--- a/module/zanode/model.php
+++ b/module/zanode/model.php
@@ -695,7 +695,7 @@ class zanodemodel extends model
*/
public function getServiceStatus($node)
{
- $result = json_decode(commonModel::http("http://{$node->ip}:{$node->zap}/api/v1/service/check", json_encode(array("services" => "all")), array(), array("Authorization:$node->tokenSN")));
+ $result = json_decode(commonModel::http("http://{$node->ip}:{$node->zap}/api/v1/service/check", json_encode(array("services" => "all")), array(), array("Authorization:$node->tokenSN"), 'data', 'POST', 2));
if(empty($result->data->ztfStatus) || $result->code != 'success')
{
$result = new stdclass;
diff --git a/module/zanode/view/view.html.php b/module/zanode/view/view.html.php
index e5c282e0fb..6c1571917b 100644
--- a/module/zanode/view/view.html.php
+++ b/module/zanode/view/view.html.php
@@ -137,7 +137,7 @@ $account = strpos($zanode->osName, "windows") ? $config->zanode->defaultWinAccou
-
zanode->init->initSuccessNoticeTitle, "{$lang->zanode->manual}", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?>
+
zanode->init->initSuccessNoticeTitle, "{$lang->zanode->manual}", html::a(helper::createLink('testcase', 'automation', "", '', true), $lang->zanode->automation, '', "class='iframe' title='{$lang->zanode->automation}' data-width='50%'", '')); ?>
zanode->init->initFailNoticeTitle . '
' . $lang->zanode->init->initFailNoticeDesc;?>