$lib):?>
-
+
doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?>
doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?>
- id");?>
+ id");?>
id&from=$from");?>
@@ -51,10 +51,10 @@
>
-
collector, $this->app->user->account) !== false ? " " : '') . $lib->name;?>
+ collector, $this->app->user->account) !== false ? " " : '') . $lib->name;?>
allCount . $lang->doc->item;?>
-
+
collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
diff --git a/module/doc/view/objectlibsbylist.html.php b/module/doc/view/objectlibsbylist.html.php
index eb636758c8..8fd2b79889 100644
--- a/module/doc/view/objectlibsbylist.html.php
+++ b/module/doc/view/objectlibsbylist.html.php
@@ -21,18 +21,18 @@
$lib):?>
-
+
doc->custom->objectLibs, 'files') === false && $libID == 'files') continue;?>
doc->custom->objectLibs, 'customFiles') === false && isset($lib->main) && !$lib->main) continue;?>
- id");?>
- id&from=$from");?>
+ id");?>
+ id&from=$from");?>
name);?>
allCount . $lang->doc->item;?>
-
+
collector, ',' . $this->app->user->account . ',') !== false ? 'icon-star text-yellow' : 'icon-star-empty';?>
collector, ',' . $this->app->user->account . ',') !== false ? $lang->doc->cancelCollection : $lang->doc->collect;?>
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 86b5c3dc59..eabaedbeea 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -72,7 +72,7 @@
id);?>
objectType, array('task', 'build')))
+ if($type == 'execution' && in_array($file->objectType, array('task', 'build')))
{
$objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ);
}
@@ -149,7 +149,7 @@
?>
objectType, array('task', 'build')))
+ if($type == 'execution' && in_array($file->objectType, array('task', 'build')))
{
$objectLink = $this->createLink($file->objectType, 'view', "objectID=$file->objectID", '', '', $file->PRJ);
}
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 1b6b719e53..d749ada46c 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -4,8 +4,8 @@ foreach($lang->doclib->tabList as $libType => $typeName) $sideLibs[$libType] = $
$allModules = $this->loadModel('tree')->getDocStructure();
$sideSubLibs = array();
-$sideSubLibs['product'] = $this->doc->getSubLibGroups('product', array_keys($sideLibs['product']));
-$sideSubLibs['project'] = $this->doc->getSubLibGroups('project', array_keys($sideLibs['project']));
+$sideSubLibs['product'] = $this->doc->getSubLibGroups('product', array_keys($sideLibs['product']));
+$sideSubLibs['execution'] = $this->doc->getSubLibGroups('execution', array_keys($sideLibs['execution']));
if($this->methodName != 'browse')
{
$browseType = '';
@@ -32,7 +32,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
navGroup->doc == 'doc' and $tabValue == 'project')
+ if($lang->navGroup->doc == 'doc' and $tabValue == 'execution')
{
echo $lang->noData;
}
@@ -71,10 +71,10 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
- projectName):?>
+ executionName):?>
- doc->project;?>
- projectName;?>
+ doc->execution;?>
+ executionName;?>
diff --git a/module/execution/control.php b/module/execution/control.php
index 88c02eb8ee..4ab6aaf367 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -45,7 +45,7 @@ class execution extends control
$this->executions = $this->execution->getPairs($this->session->project, 'all', 'nocode');
if(!$this->executions and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('execution', 'create'));
}
- $this->objectType = $this->config->systemMode == 'classic' ? 'execution' : 'exection';
+ $this->objectType = $this->config->systemMode == 'classic' ? 'project' : 'execution';
}
/**
-
$subLibName):?>
methodName == 'alllibs' && $type == 'project' && $$tabValue == $tabMenuID) ? "class='active'" : '';
+ $subLibLink = inlink('allLibs', "type=execution&product=$tabMenuID");
+ $activeClass = ($this->methodName == 'alllibs' && $type == 'execution' && $$tabValue == $tabMenuID) ? "class='active'" : '';
$icon = 'icon-stack';
}
elseif($subLibID == 'files')
@@ -173,7 +173,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
{$lang->doc->orderLib}", '', "id='orderLib' class='text-secondary small " . (($type != 'product' and $type !='project') ? '' : 'hidden') . "' style='padding-left:5px;'");
+ echo html::a('###', " {$lang->doc->orderLib}", '', "id='orderLib' class='text-secondary small " . (($type != 'product' and $type !='execution') ? '' : 'hidden') . "' style='padding-left:5px;'");
echo html::a('javascript:saveOrder()', " {$lang->save}", '', "id='saveOrder' class='text-secondary small hidden' style='padding-left:10px;'");
}
?>
@@ -217,13 +217,13 @@ $(function()
$tabs.find('.tab-content .tab-pane#' + type).addClass('active');
}
$.cookie('docSideType', '');
- $('#mainRow .side-col .side-footer #orderLib').toggleClass('hidden', (type == 'product' || type == 'project'));
+ $('#mainRow .side-col .side-footer #orderLib').toggleClass('hidden', (type == 'product' || type == 'execution'));
}
$('#mainRow .side-col .tabs .nav-tabs li a').click(function()
{
var href = $(this).attr('href');
- var canOrder = !(href.indexOf('product') > 0 || href.indexOf('project') > 0);
+ var canOrder = !(href.indexOf('product') > 0 || href.indexOf('execution') > 0);
if(!canOrder)
{
$(this).closest('.side-col').find('.side-footer #orderLib').addClass('hidden');
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 5ad49dc4a2..9345278252 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -187,10 +187,10 @@ js::set('docID', $doc->id);