Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
This commit is contained in:
@@ -0,0 +1,80 @@
|
||||
<?php
|
||||
/**
|
||||
* The productplan entry point of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package entries
|
||||
* @version 1
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
class productplanEntry extends Entry
|
||||
{
|
||||
/**
|
||||
* GET method.
|
||||
*
|
||||
* @param int $planID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function get($planID)
|
||||
{
|
||||
$fields = $this->param('fields');
|
||||
|
||||
$control = $this->loadController('productplan', 'view');
|
||||
$control->view($planID);
|
||||
|
||||
$data = $this->getData();
|
||||
if(!$data or !isset($data->status)) return $this->send400('error');
|
||||
if(isset($data->status) and $data->status == 'fail')
|
||||
{
|
||||
return isset($data->code) and $data->code == 404 ? $this->send404() : $this->sendError(400, $data->message);
|
||||
}
|
||||
|
||||
$plan = $this->format($data->data->plan, 'begin:date,end:date,deleted:bool');
|
||||
|
||||
return $this->send(200, $plan);
|
||||
}
|
||||
|
||||
/**
|
||||
* PUT method.
|
||||
*
|
||||
* @param int $planID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function put($planID)
|
||||
{
|
||||
$oldPlan = $this->loadModel('productplan')->getByID($planID);
|
||||
|
||||
/* Set $_POST variables. */
|
||||
$fields = 'title,begin,end,desc';
|
||||
$this->batchSetPost($fields, $oldPlan);
|
||||
|
||||
$control = $this->loadController('productplan', 'edit');
|
||||
$control->edit($planID);
|
||||
|
||||
$data = $this->getData();
|
||||
if(isset($data->result) and $data->result == 'fail') return $this->sendError(400, $data->message);
|
||||
|
||||
$plan = $this->productplan->getByID($planID);
|
||||
$this->sendSuccess(200, $this->format($plan, 'begin:date,end:date'));
|
||||
}
|
||||
|
||||
/**
|
||||
* DELETE method.
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function delete($planID)
|
||||
{
|
||||
$control = $this->loadController('productplan', 'delete');
|
||||
$control->delete($planID, 'yes');
|
||||
|
||||
$this->getData();
|
||||
$this->sendSuccess(200, 'success');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
/**
|
||||
* The productplans entry point of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package entries
|
||||
* @version 1
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
class productplansEntry extends entry
|
||||
{
|
||||
/**
|
||||
* GET method.
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function get($productID = 0)
|
||||
{
|
||||
if(!$productID) $productID = $this->param('product');
|
||||
if(!$productID) return $this->sendError(400, 'No product id.');
|
||||
|
||||
$control = $this->loadController('productplan', 'browse');
|
||||
$control->browse($productID, $this->param('branch', 0), $this->param('status', 'all'), $this->param('order', 'begin_desc'), 0, $this->param('limit', 20), $this->param('page', 1));
|
||||
|
||||
/* Response */
|
||||
$data = $this->getData();
|
||||
if(isset($data->status) and $data->status == 'success')
|
||||
{
|
||||
$result = array();
|
||||
$plans = $data->data->plans;
|
||||
foreach($plans as $plan) $result[] = $plan;
|
||||
|
||||
return $this->send(200, array('productplans' => $result));
|
||||
}
|
||||
|
||||
if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
|
||||
|
||||
return $this->sendError(400, 'error');
|
||||
}
|
||||
}
|
||||
@@ -12,7 +12,7 @@
|
||||
class productsEntry extends entry
|
||||
{
|
||||
/**
|
||||
* POST method.
|
||||
* GET method.
|
||||
*
|
||||
* @param int $projectID
|
||||
* @access public
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
<?php
|
||||
/**
|
||||
* The release entry point of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package entries
|
||||
* @version 1
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
class releaseEntry extends Entry
|
||||
{
|
||||
/**
|
||||
* GET method.
|
||||
*
|
||||
* @param int $planID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function get($releaseID)
|
||||
{
|
||||
$control = $this->loadController('release', 'view');
|
||||
$control->view($releaseID);
|
||||
|
||||
$data = $this->getData();
|
||||
if(!$data or !isset($data->status)) return $this->send400('error');
|
||||
if(isset($data->status) and $data->status == 'fail')
|
||||
{
|
||||
return isset($data->code) and $data->code == 404 ? $this->send404() : $this->sendError(400, $data->message);
|
||||
}
|
||||
|
||||
$plan = $this->format($data->data->release, 'date:date,deleted:bool');
|
||||
|
||||
return $this->send(200, $plan);
|
||||
}
|
||||
|
||||
/**
|
||||
* PUT method.
|
||||
*
|
||||
* @param int $releaseID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function put($releaseID)
|
||||
{
|
||||
$oldRelease = $this->loadModel('release')->getByID($releaseID);
|
||||
|
||||
/* Set $_POST variables. */
|
||||
$fields = 'name,build,status,desc';
|
||||
$this->batchSetPost($fields, $oldRelease);
|
||||
|
||||
$control = $this->loadController('release', 'edit');
|
||||
$control->edit($releaseID);
|
||||
|
||||
$data = $this->getData();
|
||||
if(isset($data->result) and $data->result == 'fail') return $this->sendError(400, $data->message);
|
||||
|
||||
$release = $this->release->getByID($releaseID);
|
||||
$this->sendSuccess(200, $this->format($release, 'date:date,deleted:bool'));
|
||||
}
|
||||
|
||||
/**
|
||||
* DELETE method.
|
||||
*
|
||||
* @param int $releaseID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function delete($releaseID)
|
||||
{
|
||||
$control = $this->loadController('release', 'delete');
|
||||
$control->delete($releaseID, 'yes');
|
||||
|
||||
$this->getData();
|
||||
$this->sendSuccess(200, 'success');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
<?php
|
||||
/**
|
||||
* The productplans entry point of ZenTaoPMS.
|
||||
*
|
||||
* @copyright Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
|
||||
* @license ZPL (http://zpl.pub/page/zplv12.html)
|
||||
* @author Chunsheng Wang <chunsheng@cnezsoft.com>
|
||||
* @package entries
|
||||
* @version 1
|
||||
* @link http://www.zentao.net
|
||||
*/
|
||||
class releasesEntry extends entry
|
||||
{
|
||||
/**
|
||||
* GET method.
|
||||
*
|
||||
* @param int $productID
|
||||
* @access public
|
||||
* @return void
|
||||
*/
|
||||
public function get($productID = 0)
|
||||
{
|
||||
if(!$productID) $productID = $this->param('product');
|
||||
if(!$productID) return $this->sendError(400, 'No product id.');
|
||||
|
||||
$control = $this->loadController('release', 'browse');
|
||||
$control->browse($productID, $this->param('branch', 0), $this->param('status', 'all'));
|
||||
|
||||
/* Response */
|
||||
$data = $this->getData();
|
||||
if(isset($data->status) and $data->status == 'success')
|
||||
{
|
||||
$result = array();
|
||||
$releases = $data->data->releases;
|
||||
foreach($releases as $release) $result[] = $release;
|
||||
|
||||
return $this->send(200, array('releases' => $result));
|
||||
}
|
||||
|
||||
if(isset($data->status) and $data->status == 'fail') return $this->sendError(400, $data->message);
|
||||
|
||||
return $this->sendError(400, 'error');
|
||||
}
|
||||
}
|
||||
+11
-2
@@ -9,11 +9,20 @@ $routes['/tokens'] = 'tokens';
|
||||
$routes['/configurations'] = 'configs';
|
||||
$routes['/configurations/:name'] = 'config';
|
||||
|
||||
$routes['/products'] = 'products';
|
||||
$routes['/products/:id'] = 'product';
|
||||
$routes['/products'] = 'products';
|
||||
$routes['/products/:id'] = 'product';
|
||||
|
||||
$routes['/productlines'] = 'productLines';
|
||||
$routes['/productlines/:id'] = 'productLine';
|
||||
|
||||
$routes['/productplans'] = 'productPlans';
|
||||
$routes['/product/:id/productplans'] = 'productPlans';
|
||||
$routes['/productplans/:id'] = 'productPlan';
|
||||
|
||||
$routes['/releases'] = 'releases';
|
||||
$routes['/product/:id/releases'] = 'releases';
|
||||
$routes['/releases/:id'] = 'release';
|
||||
|
||||
$routes['/products/:id/stories'] = 'stories';
|
||||
$routes['/executions/:id/stories'] = 'executionStories';
|
||||
$routes['/stories/:id'] = 'story';
|
||||
|
||||
@@ -278,7 +278,7 @@ class html extends baseHTML
|
||||
{
|
||||
$colorHue = (html::stringToCode($user->account) * $hueDistance) % 360;
|
||||
$style .= "background: hsl($colorHue, $saturation, $lightness);";
|
||||
if($size) $style .= 'font-size: ' . round($size * 2 / 3) . 'px;';
|
||||
if(is_numeric($size)) $style .= 'font-size: ' . round($size * 2 / 3) . 'px;';
|
||||
}
|
||||
|
||||
if(!empty($style)) $style = "style='$style'";
|
||||
|
||||
@@ -781,7 +781,7 @@ class actionModel extends model
|
||||
$docs = $this->doc->getPrivDocs(array_keys($libs), 0, 'all');
|
||||
|
||||
$actionCondition = $this->getActionCondition();
|
||||
if(!$actionCondition and isset($this->app->user->rights['acls']['actions'])) return array();
|
||||
if(!$actionCondition and !$this->app->user->admin and isset($this->app->user->rights['acls']['actions'])) return array();
|
||||
|
||||
/* Get actions. */
|
||||
$actions = $this->dao->select('*')->from(TABLE_ACTION)
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#kanbanList .kanban-item.has-left-border.border-left-red {border-left-color: #ff5d5d;}
|
||||
#kanbanList .kanban-item.has-left-border.border-left-blue {border-left-color: #0991ff;}
|
||||
|
||||
.kanban-affixed {padding-top: 72px;}
|
||||
.kanban-affixed > .kanban-header {position: fixed!important; top: 0; background: rgba(80,80,80,.9); color: #fff; z-index: 100;}
|
||||
|
||||
#kanbanList .kanban-header-col[data-type="doingProject"],
|
||||
@@ -341,9 +342,9 @@ function renderKanbanItem(item, $item, col)
|
||||
*/
|
||||
function affixKanbanHeader($kanbanBoard, affixed)
|
||||
{
|
||||
$kanbanBoard.toggleClass('kanban-affixed', !!affixed);
|
||||
var $header = $kanbanBoard.children('.kanban-header');
|
||||
$header.css('width', affixed ? $kanbanBoard.width() : '');
|
||||
$kanbanBoard.toggleClass('kanban-affixed', !!affixed);
|
||||
$kanbanBoard.css('padding-top', affixed ? $header.outerHeight() : '');
|
||||
}
|
||||
|
||||
@@ -387,17 +388,31 @@ $.extend($.fn.kanban.Constructor.DEFAULTS,
|
||||
/* laneItemsClass: 'scrollbar-hover', */ // only show scrollbar on mouse hover
|
||||
itemRender: renderKanbanItem,
|
||||
useFlex: false,
|
||||
showZeroCount: true,
|
||||
onRenderHeaderCol: function($col, col)
|
||||
{
|
||||
if(col.type === 'doingProject') $col.attr('data-span-text', doingText);
|
||||
},
|
||||
onRenderKanban: function($kanban)
|
||||
onRenderKanban: function($kanban, kanbanData)
|
||||
{
|
||||
$kanban.find('.kanban-lane-name').each(function(index)
|
||||
{
|
||||
var color = kanbanColorList[index % kanbanColorList.length];
|
||||
$(this).css('background-color', color);
|
||||
});
|
||||
|
||||
/* Update project count and execution count */
|
||||
var doingProjectCount = 0;
|
||||
var doingExecutionCount = 0;
|
||||
var $doingProjectItems = $kanban.find('.kanban-lane-col[data-type="doingProject"] > .kanban-lane-items');
|
||||
if($doingProjectItems.length)
|
||||
{
|
||||
doingProjectCount = $doingProjectItems.find('.project-item').length;
|
||||
doingExecutionCount = $doingProjectItems.find('.execution-item').length;
|
||||
}
|
||||
$kanban.find('.kanban-header-col[data-type="doingProject"] > .title > .count').text(doingProjectCount || 0);
|
||||
$kanban.find('.kanban-header-col[data-type="doingExecution"] > .title > .count').text(doingExecutionCount || 0);
|
||||
|
||||
updateKanbanAffixState();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -405,7 +405,7 @@ class gitlabModel extends model
|
||||
{
|
||||
$gitlab = $this->loadModel('gitlab')->getByID($gitlabID);
|
||||
if(!$gitlab) return '';
|
||||
$url = rtrim($gitlab->url, '/')."/api/v4/todos?project_id=$projectID&type=MergeRequest&private_token={$gitlab->token}&sudo={$sudo}";
|
||||
$url = rtrim($gitlab->url, '/')."/api/v4/todos?project_id=$projectID&type=MergeRequest&state=pending&private_token={$gitlab->token}&sudo={$sudo}";
|
||||
return json_decode(commonModel::http($url));
|
||||
}
|
||||
|
||||
|
||||
+2
-1
@@ -333,9 +333,10 @@ class mrModel extends model
|
||||
$todo->idvalue = $rawTodo->id;
|
||||
$todo->pri = 3;
|
||||
$todo->name = $this->lang->mr->common . ": " . $rawTodo->target->title;
|
||||
$todo->desc = $rawTodo->target->description . "<br>" . '<a href="' . $this->todoDescriptionLink($gitlabID, $projectID) . '" target="_blank">' . $this->todoDescriptionLink($gitlabID, $projectID) .'</a>';
|
||||
$todo->desc = $rawTodo->target->description . "<br>" . '<a href="' . $rawTodo->target->web_url . '" target="_blank">' . $rawTodo->target->web_url .'</a>';
|
||||
$todo->status = 'wait';
|
||||
$todo->finishedBy = '';
|
||||
|
||||
$this->dao->insert(TABLE_TODO)->data($todo)->exec();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,6 @@ th.table-nest-title .table-nest-toggle {top: 12px; opacity: .6;}
|
||||
th.table-nest-title .table-nest-toggle:hover {opacity: 1;}
|
||||
|
||||
#productTableList .icon-product:before {content: '\e98f'; width: 22px; height: 22px; background: none; color: rgb(166, 170, 184); top: 0; line-height: 22px; margin-right: 2px; font-size: 14px;}
|
||||
#productTableList>tr>td:first-child {padding-left: 10px;}
|
||||
|
||||
.table.has-sort-head thead>tr>th>a:after, .table.has-sort-head thead>tr>th>a:before {top: -3px;}
|
||||
.main-table thead>tr>th {padding: 0px 8px; line-height: 24px;}
|
||||
|
||||
@@ -238,4 +238,10 @@
|
||||
</div>
|
||||
<?php js::set('orderBy', $orderBy)?>
|
||||
<?php js::set('browseType', $browseType)?>
|
||||
<?php if(commonModel::isTutorialMode()): ?>
|
||||
<style>
|
||||
#productListForm {overflow: hidden;}
|
||||
#productList .table-nest-title {width: 200px;}
|
||||
</style>
|
||||
<?php endif; ?>
|
||||
<?php include '../../common/view/footer.html.php';?>
|
||||
|
||||
@@ -189,6 +189,8 @@ class productplan extends control
|
||||
}
|
||||
return $this->send($response);
|
||||
}
|
||||
|
||||
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
|
||||
die(js::locate(inlink('browse', "productID=$plan->product&branch=$plan->branch"), 'parent'));
|
||||
}
|
||||
}
|
||||
@@ -249,7 +251,11 @@ class productplan extends control
|
||||
{
|
||||
$planID = (int)$planID;
|
||||
$plan = $this->productplan->getByID($planID, true);
|
||||
if(!$plan) die(js::error($this->lang->notFound) . js::locate('back'));
|
||||
if(!$plan)
|
||||
{
|
||||
if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'fail', 'code' => 404, 'message' => '404 Not found'));
|
||||
die(js::error($this->lang->notFound) . js::locate('back'));
|
||||
}
|
||||
|
||||
$this->session->set('storyList', $this->app->getURI(true) . '&type=' . 'story', 'product');
|
||||
$this->session->set('bugList', $this->app->getURI(true) . '&type=' . 'bug', 'qa');
|
||||
|
||||
@@ -259,9 +259,12 @@ class release extends control
|
||||
$release = $this->release->getById($releaseID);
|
||||
$this->dao->update(TABLE_BUILD)->set('deleted')->eq(1)->where('id')->eq($release->build)->andWhere('name')->eq($release->name)->exec();
|
||||
}
|
||||
|
||||
return $this->send($response);
|
||||
}
|
||||
|
||||
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
|
||||
|
||||
$locateLink = $this->session->releaseList ? $this->session->releaseList : inlink('browse', "productID={$release->product}");
|
||||
die(js::locate($locateLink, 'parent'));
|
||||
}
|
||||
|
||||
+15
-15
@@ -1033,16 +1033,16 @@ class treeModel extends model
|
||||
{
|
||||
$productID = zget($extra, 'productID', 0);
|
||||
$projectID = $extra['projectID'];
|
||||
return html::a(helper::createLink('projectstory', 'story', "projectID=$projectID&productID=$productID&branch=&browseType=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('projectstory', 'story', "projectID=$projectID&productID=$productID&branch=&browseType=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
elseif(isset($extra['executionID']) and !empty($extra['executionID']))
|
||||
{
|
||||
$executionID = $extra['executionID'];
|
||||
return html::a(helper::createLink('execution', 'story', "executionID=$executionID&orderBy=order_desc&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('execution', 'story', "executionID=$executionID&orderBy=order_desc&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
else
|
||||
{
|
||||
return html::a(helper::createLink('product', 'browse', "root={$module->root}&branch=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('product', 'browse', "root={$module->root}&branch=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1075,7 +1075,7 @@ class treeModel extends model
|
||||
{
|
||||
$executionID = $extra['executionID'];
|
||||
$productID = $extra['productID'];
|
||||
return html::a(helper::createLink('execution', 'task', "executionID={$executionID}&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('execution', 'task', "executionID={$executionID}&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1090,7 +1090,7 @@ class treeModel extends model
|
||||
public function createProjectStoryLink($type, $module, $extra)
|
||||
{
|
||||
$productID = $extra['productID'];
|
||||
return html::a(helper::createLink('projectstory', 'story', "projectID={$extra['executionID']}&productID=$productID&branch=&browseType=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('projectstory', 'story', "projectID={$extra['executionID']}&productID=$productID&branch=&browseType=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1103,7 +1103,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createRequirementLink($type, $module)
|
||||
{
|
||||
return html::a(helper::createLink($this->app->rawModule, $this->app->rawMethod, "root={$module->root}&branch=&type=byModule¶m={$module->id}&storyType=requirement"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink($this->app->rawModule, $this->app->rawMethod, "root={$module->root}&branch=&type=byModule¶m={$module->id}&storyType=requirement"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1115,7 +1115,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createDocLink($type, $module, $extra = '')
|
||||
{
|
||||
return html::a(helper::createLink('doc', 'browse', "libID={$module->root}&browseType=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('doc', 'browse', "libID={$module->root}&browseType=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1187,7 +1187,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createBugLink($type, $module)
|
||||
{
|
||||
return html::a(helper::createLink('bug', 'browse', "root={$module->root}&branch=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('bug', 'browse', "root={$module->root}&branch=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1202,7 +1202,7 @@ class treeModel extends model
|
||||
$moduleName = $this->app->tab == 'project' ? 'project' : 'testcase';
|
||||
$methodName = $this->app->tab == 'project' ? 'testcase' : 'browse';
|
||||
$projectParam = $this->app->tab == 'project' ? "projectID={$this->session->project}&" : '';
|
||||
return html::a(helper::createLink($moduleName, $methodName, $projectParam . "root={$module->root}&branch=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' data-app='{$this->app->tab}'");
|
||||
return html::a(helper::createLink($moduleName, $methodName, $projectParam . "root={$module->root}&branch=&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' data-app='{$this->app->tab}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1214,7 +1214,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createTestTaskLink($type, $module, $extra)
|
||||
{
|
||||
return html::a(helper::createLink('testtask', 'cases', "taskID=$extra&type=byModule&module={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('testtask', 'cases', "taskID=$extra&type=byModule&module={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1227,7 +1227,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createCaseLibLink($type, $module)
|
||||
{
|
||||
return html::a(helper::createLink('caselib', 'browse', "root={$module->root}&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('caselib', 'browse', "root={$module->root}&type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1257,7 +1257,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createFeedbackLink($type, $module)
|
||||
{
|
||||
return html::a(helper::createLink('feedback', $this->app->methodName, "type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('feedback', $this->app->methodName, "type=byModule¶m={$module->id}"), $module->name, '_self', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1270,7 +1270,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createTrainSkillLink($type, $module, $extra = '')
|
||||
{
|
||||
return html::a(helper::createLink('trainskill', 'browse', "type=byModule¶m={$module->id}"), $module->name, '', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('trainskill', 'browse', "type=byModule¶m={$module->id}"), $module->name, '', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1283,7 +1283,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createTrainCourseLink($type, $module, $extra = '')
|
||||
{
|
||||
return html::a(helper::createLink('traincourse', 'browse', "type=byModule¶m={$module->id}"), $module->name, '', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('traincourse', 'browse', "type=byModule¶m={$module->id}"), $module->name, '', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1296,7 +1296,7 @@ class treeModel extends model
|
||||
*/
|
||||
public function createTrainPostLink($type, $module, $extra = '')
|
||||
{
|
||||
return html::a(helper::createLink('trainpost', 'browse', "type=byModule¶m={$module->id}"), $module->name, '', "id='module{$module->id}'");
|
||||
return html::a(helper::createLink('trainpost', 'browse', "type=byModule¶m={$module->id}"), $module->name, '', "id='module{$module->id}' title='{$module->name}'");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -59,7 +59,7 @@ $lang->tutorial->tasks['createProject']['desc'] = "<p>Create a {$lang->projectCo
|
||||
|
||||
$lang->tutorial->tasks['manageTeam'] = array('title' => "Manage {$lang->projectCommon} Team");
|
||||
$lang->tutorial->tasks['manageTeam']['mode'] = 'new';
|
||||
$lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'accounts1', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
|
||||
$lang->tutorial->tasks['manageTeam']['nav'] = array('app' => 'project', 'module' => 'project', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#projectTableList>tr:first>.c-name a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="members"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'accounts1,accounts', 'submit' => '#submit', 'targetPageName' => 'Manage team members');
|
||||
$lang->tutorial->tasks['manageTeam']['desc'] = "<p>Manage {$lang->projectCommon} team members: </p><ul><li data-target='nav'>Open <span class='task-nav'> {$lang->projectCommon} <i class='icon icon-angle-right'></i> Team <i class='icon icon-angle-right'></i> Manage Team Members</span> Page;</li><li data-target='form'>Choose users for the team.</li><li data-target='submit'>Save</li></ul>";
|
||||
|
||||
$lang->tutorial->tasks['createExecution'] = array('title' => 'Create a ' . $lang->executionCommon);
|
||||
|
||||
@@ -68,7 +68,7 @@ $lang->tutorial->tasks['createExecution']['desc'] = "<p>在系统创建一个新
|
||||
|
||||
$lang->tutorial->tasks['manageExecutionTeam'] = array('title' => "管理{$lang->executionCommon}团队");
|
||||
$lang->tutorial->tasks['manageExecutionTeam']['mode'] = 'classic';
|
||||
$lang->tutorial->tasks['manageExecutionTeam']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理');
|
||||
$lang->tutorial->tasks['manageExecutionTeam']['nav'] = array('app' => 'execution', 'module' => 'execution', 'method' => 'managemembers', 'menuModule' => '', 'menu' => '#navbar>.nav>li[data-id="browse"],#cards>.col>.panel:first .project-name,#executionTableList>tr:first>.c-name>a,#navbar>.nav>li[data-id="settings"],#subNavbar>.nav>li[data-id="team"],.manage-team-btn', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1,accounts', 'submit' => '#submit', 'targetPageName' => '团队管理');
|
||||
$lang->tutorial->tasks['manageExecutionTeam']['desc'] = "<p>管理{$lang->executionCommon}团队成员:</p><ul><li data-target='nav'>打开 <span class='task-nav'> {$lang->executionCommon} <i class='icon icon-angle-right'></i> 设置 <i class='icon icon-angle-right'></i> 团队 <i class='icon icon-angle-right'></i> 团队管理</span> 页面;</li><li data-target='form'>选择要加入团队的成员;</li><li data-target='submit'>保存团队成员信息。</li></ul>";
|
||||
|
||||
$lang->tutorial->tasks['linkStory'] = array('title' => "关联{$lang->SRCommon}");
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -70,3 +70,4 @@ a.showMoreImage:hover {opacity: 1;}
|
||||
#userNav .dropdown-menu, #userNav .create-list {margin-right: -15px !important; border-top: 0px;}
|
||||
#userNav .dropdown-menu .dropdown-submenu>ul {margin-right: 0px !important;}
|
||||
#userNav .create-list:hover:before {right: 21.5% !important;}
|
||||
#modules li>a, #modules ul>li>a {overflow: hidden; white-space: nowrap;}
|
||||
|
||||
Reference in New Issue
Block a user