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

Merge branch 'sprint/master_lanzongjun_fixbug_lite' into 'sprint/165_package'

Browse Source 
* fix bug #21088,#21077

See merge request easycorp/zentaopms!2507
This commit is contained in:
王怡栋
2022-03-24 08:39:06 +00:00
parent b62c165dee a37d937d63
commit e504d28044
2 changed files with 8 additions and 2 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};