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

* Add type param for update doc catalog order.

Browse Source
This commit is contained in:
hufangzhou
2024-05-24 16:18:07 +08:00
committed by caoyanyi
parent 9a99666f02
commit a2efaabee0
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/js/common.ui.js
+1
View File
@@ -385,6 +385,7 @@ window.updateOrder = function(event, orders)
{
let sortedIdList = {};
for(let i in orders) sortedIdList['orders[' + orders[i] + ']'] = i;
sortedIdList['type'] = 'api';
$.post($.createLink('doc', 'sortCatalog'), sortedIdList);
}
module/doc/control.php
+1 -1
View File
@@ -1009,7 +1009,7 @@ class doc extends control
{
if($_POST)
{
foreach($_POST['orders'] as $id => $order) $this->doc->updateOrder($id, (int)$order);
foreach($_POST['orders'] as $id => $order) $this->doc->updateOrder($id, (int)$order, $_POST['type']);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
return $this->send(array('result' => 'success'));
module/doc/js/common.ui.js
+1
View File
@@ -241,6 +241,7 @@ window.updateOrder = function(event, orders)
{
let sortedIdList = {};
for(let i in orders) sortedIdList['orders[' + orders[i] + ']'] = i;
sortedIdList['type'] = 'doc';
$.post($.createLink('doc', 'sortCatalog'), sortedIdList);
}
module/doc/model.php
+3 -2
View File
@@ -2797,12 +2797,13 @@ class docModel extends model
*
* @param int $catalogID
* @param int $order
* @param string $order
* @access public
* @return bool
*/
public function updateOrder(int $catalogID, int $order): bool
public function updateOrder(int $catalogID, int $order, string $type = 'doc'): bool
{
$this->dao->update(TABLE_MODULE)->set('`order`')->eq($order)->where('id')->eq($catalogID)->andWhere('type')->eq('doc')->exec();
$this->dao->update(TABLE_MODULE)->set('`order`')->eq($order)->where('id')->eq($catalogID)->andWhere('type')->eq($type)->exec();
return !dao::isError();
}
module/doc/test/lib/doc.unittest.class.php
+3 -2
View File
@@ -1419,12 +1419,13 @@ class docTest
*
* @param int $catalogID
* @param int $order
* @param string $type api|doc
* @access public
* @return int|false
*/
public function updateOrderTest(int $catalogID, int $order): int|false
public function updateOrderTest(int $catalogID, int $order, string $type = 'doc'): int|false
{
$this->objectModel->updateOrder($catalogID, $order);
$this->objectModel->updateOrder($catalogID, $order, $type);
if(dao::isError()) return dao::getError();
return $this->objectModel->dao->select('`order`')->from(TABLE_MODULE)->where('id')->eq($catalogID)->fetch('order');