Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'sprint/165_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into package

Browse Source
This commit is contained in:
zhouxin
2022-03-24 08:57:23 +00:00
parent 3291a491c9 47318553e7
commit eb977b865d
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/group/ext/lang/resource.php
+4
View File
@@ -444,6 +444,8 @@ $lang->resource->execution->unbindWhitelist = 'unbindWhitelist';
//$lang->resource->execution->storyEstimate = 'storyEstimate';
$lang->resource->execution->kanban = 'kanban';
//if($config->systemMode == 'classic') $lang->resource->project->list = 'list';
if($config->edition != 'open') $lang->resource->execution->gantt = 'ganttchart';
if($config->edition != 'open') $lang->resource->execution->calendar = 'calendar';
//$lang->execution->methodOrder[0] = 'index';
//if($config->systemMode == 'classic') $lang->project->methodOrder[1] = 'list';
@@ -498,6 +500,8 @@ $lang->execution->methodOrder[250] = 'addWhitelist';
$lang->execution->methodOrder[255] = 'unbindWhitelist';
$lang->execution->methodOrder[260] = 'storyEstimate';
$lang->execution->methodOrder[270] = 'kanban';
$lang->execution->methodOrder[280] = 'gantt';
$lang->execution->methodOrder[285] = 'calendar';
/* Task. */
$lang->resource->task = new stdclass();
module/execution/js/kanban.js
+4 -2
View File
@@ -231,13 +231,15 @@ $('.c-group').change(function()
*/
function createLaneMenu(options)
{
var lane = options.$trigger.closest('.kanban-lane').data('lane');
var lane = options.$trigger.closest('.kanban-lane').data('lane');
var laneCount = options.$trigger.closest('.kanban-board').children('.kanban-lane').length;
var privs = lane.actions;
if(!privs.length) return [];
var items = [];
if(privs.includes('setLane')) items.push({label: kanbanLang.setLane, icon: 'edit', url: createLink('kanban', 'setLane', 'laneID=' + lane.id + '&executionID=0&from=kanban'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '635px'}});
if(privs.includes('deleteLane')) items.push({label: kanbanLang.deleteLane, icon: 'trash', url: createLink('kanban', 'deleteLane', 'lane=' + lane.id), attrs: {'target': 'hiddenwin'}});
if(privs.includes('deleteLane') && laneCount > 1) items.push({label: kanbanLang.deleteLane, icon: 'trash', url: createLink('kanban', 'deleteLane', 'lane=' + lane.id), attrs: {'target': 'hiddenwin'}});
var bounds = options.$trigger[0].getBoundingClientRect();
items.$options = {x: bounds.right, y: bounds.top};
module/story/control.php
+4 -4
View File
@@ -51,14 +51,14 @@ class story extends control
parse_str($extra, $output);
if($productID == 0 and $objectID == 0) $this->locate($this->createLink('product', 'create'));
/* Get product id according to the project id when lite vision todo transfer story */
if($this->config->vision == 'lite' and $productID == 0)
if($this->config->vision == 'lite' and $productID == 0)
{
$product = $this->loadModel('product')->getProductPairsByProject($objectID);
if(!empty($project)) $productID = key($product);
}
$this->story->replaceURLang($type);
if($this->app->tab == 'product')
{
@@ -2492,7 +2492,7 @@ class story extends control
$story->reviewedBy = rtrim($story->reviewedBy, ',');
/* Set child story title. */
if($story->parent > 0 && strpos($story->title, htmlentities('>'), ENT_COMPAT | ENT_HTML401, 'UTF-8') !== 0) $story->title = '>' . $story->title;
if($story->parent > 0 && strpos($story->title, htmlentities('>', ENT_COMPAT | ENT_HTML401, 'UTF-8')) !== 0) $story->title = '>' . $story->title;
}
if($executionID)