* Adjust code style.

This commit is contained in:
tianshujie98
2020-12-28 14:09:56 +08:00
parent 4ef32f3efc
commit 3b96307d45
4 changed files with 17 additions and 7 deletions
-1
View File
@@ -459,7 +459,6 @@ class my extends control
* My projects.
*
* @param string $status doing|wait|suspended|closed|openedbyme
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
+9 -4
View File
@@ -86,7 +86,8 @@ class personnel extends control
* Get white list personnel.
*
* @param int $objectID
* @param string $browsetype
* @param string $module personnel|program
* @param string $objectType program|project|product|sprint
* @param string $orderby
* @param int $recTotal
* @param int $recPerPage
@@ -97,14 +98,16 @@ class personnel extends control
public function whitelist($objectID = 0, $module = 'personnel', $objectType = 'program', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{
if($module == 'personnel') $this->setProgramNavMenu($objectID);
/* Load lang and set session. */
$this->app->loadLang('user');
$this->app->session->set('whitelistBrowse', $this->app->getURI(true));
/* Load pager. */
$this->app->loadClass('pager', true);
$pager = pager::init($recTotal, $recPerPage, $pageID);
$whitelist = $this->personnel->getWhitelist($objectID, $objectType, $orderBy, $pager);
/* Set back link. */
if($module == 'program')
{
$goback = $this->session->PRJBrowse ? $this->session->PRJBrowse : $this->createLink('program', 'PRJBrowse');
@@ -113,9 +116,10 @@ class personnel extends control
$this->view->title = $this->lang->personnel->whitelist;
$this->view->position[] = $this->lang->personnel->whitelist;
$this->view->pager = $pager;
$this->view->objectID = $objectID;
$this->view->whitelist = $whitelist;
$this->view->whitelist = $this->personnel->getWhitelist($objectID, $objectType, $orderBy, $pager);
$this->view->depts = $this->loadModel('dept')->getOptionMenu();
$this->view->module = $module;
@@ -128,6 +132,7 @@ class personnel extends control
* @param int $objectID
* @param int $deptID
* @param string $objectType program|project|product|sprint
* @param string $module
* @access public
* @return void
*/
+2 -2
View File
@@ -37,5 +37,5 @@
.main-table thead>tr:first-of-type>th {border-left: 1px solid #ddd;}
th.table-nest-title .table-nest-toggle {margin-top: 15px; margin-left: 6px;}
th.table-nest-title .header {margin-left: 5px;}
th.table-nest-title .sort-up {padding-left: 10px;}
th.table-nest-title .sort-down {padding-left: 10px;}
th.table-nest-title .sort-up {padding-left: 5px;}
th.table-nest-title .sort-down {padding-left: 5px;}
+6
View File
@@ -1,13 +1,17 @@
$("#" + browseType + "Tab").addClass('btn-active-text');
$(function()
{
/* Init table sort. */
var $list = $('#productTableList');
$list.addClass('sortable').sortable(
{
/* Init vars. */
reverse: orderBy === 'order_desc',
selector: 'tr',
dragCssClass: 'drag-row',
trigger: $list.find('.sort-handler').length ? '.sort-handler' : null,
/* Set movable conditions. */
canMoveHere: function($ele, $target)
{
return $ele.data('parent') === $target.data('parent');
@@ -16,6 +20,8 @@ $(function()
{
e.targets.filter('[data-parent!="' + e.element.attr('data-parent') + '"]').addClass('drop-not-allowed');
},
/* Update order sort. */
finish: function(e)
{
var products = '';