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

Merge branch 'sprint/235_tianshujie_66996' into 'master'

Browse Source 
* Finish task #66996.

See merge request easycorp/zentaopms!5220
This commit is contained in:
孙广明
2022-09-01 00:38:34 +00:00
parent c484efc345 83802fc922
commit 27d28d2027
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+5 -5
View File
@@ -1143,7 +1143,7 @@ class kanban extends control
$this->loadModel('action')->create('kanbancard', $cardID, 'importedcard', '', $cards2Imported[$cardID]->kanban);
}
return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
return print(js::locate($this->session->kanbanView, 'parent.parent'));
}
/* Find Kanban other than this kanban. */
@@ -1190,7 +1190,7 @@ class kanban extends control
$this->loadModel('action')->create('kanbancard', $cardID, 'importedProductplan', '', $planID);
}
return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
return print(js::locate($this->session->kanbanView, 'parent.parent'));
}
$this->loadModel('product');
@@ -1242,7 +1242,7 @@ class kanban extends control
$this->loadModel('action')->create('kanbancard', $cardID, 'importedRelease', '', $releaseID);
}
return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
return print(js::locate($this->session->kanbanView, 'parent.parent'));
}
$this->loadModel('product');
@@ -1291,7 +1291,7 @@ class kanban extends control
$this->loadModel('action')->create('kanbancard', $cardID, 'importedBuild', '', $buildID);
}
return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
return print(js::locate($this->session->kanbanView, 'parent.parent'));
}
$this->loadModel('build');
@@ -1353,7 +1353,7 @@ class kanban extends control
$this->loadModel('action')->create('kanbancard', $cardID, 'importedExecution', '', $executionID);
}
return print(js::locate($this->createLink('kanban', 'view', "kanbanID=$kanbanID"), 'parent.parent'));
return print(js::locate($this->session->kanbanView, 'parent.parent'));
}
$this->loadModel('project');
module/kanban/js/view.js
+4 -5
View File
@@ -1838,13 +1838,12 @@ function swipeRegionNavTabs($object, direction)
var $regionNavTabs = $('#regionNavTabs');
var offsetWidth = $regionNavTabs[0].offsetWidth;
var objectWidth = $object[0].offsetWidth;
var radius = 0;
$object.css('transition-duration', '1s');
$object.find('li').each(function()
{
if($(this).hasClass('active') && radius == 0) radius = radiusWidth;
var radius = $(this).hasClass('active') ? radiusWidth : 0;
/* Get the offset of the item. */
var itemLeft = $(this)[0].offsetLeft;
@@ -1852,10 +1851,10 @@ function swipeRegionNavTabs($object, direction)
var itemOffset = itemLeft + itemWidth;
/* Calculate the offset after sliding. */
if(direction == 'left' && (itemOffset + distance + radius) >= 0)
if(direction == 'left' && (itemOffset + distance) >= 0)
{
/* If you swipe left, the distance is equal to the item's left. */
distance = - itemLeft - radius;
distance = - itemLeft + radius;
if(distance + radius >= 0)
{
distance = radius;
@@ -1868,7 +1867,7 @@ function swipeRegionNavTabs($object, direction)
return false;
}
if(direction == 'right' && itemOffset > (offsetWidth - distance + radius))
if(direction == 'right' && itemOffset > (offsetWidth - distance))
{
/* If you swipe right, the distance is equal to the left distance of item plus the width of item minus the width of the regionNavTabs. */
distance = offsetWidth - itemOffset - radius;