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

* [bug#60750] Add the pre of m for parent.

Browse Source
This commit is contained in:
xieqiyu
2025-03-21 10:18:54 +08:00
committed by 代婷婷
parent 7a825dac68
commit 5211fbd2cb
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+2 -2
View File
@@ -672,8 +672,8 @@ class doc extends control
$docData = form::data()
->setDefault('editedBy', $this->app->user->account)
->setDefault('acl', $doc->acl)
->setDefault('module', $doc->module)
->setIF(strpos(",$doc->editedList,", ",{$this->app->user->account},") === false, 'editedList', $doc->editedList . ",{$this->app->user->account}")
->setIF(!isset($_POST['module']), 'module', $doc->module)
->setIF(!isset($_POST['mailto']), 'mailto', $doc->mailto)
->setIF(!isset($_POST['users']), 'users', $doc->users)
->setIF(!isset($_POST['groups']), 'groups', $doc->groups)
@@ -826,7 +826,7 @@ class doc extends control
$chapterAndDocs = $this->doc->getDocsOfLibs(array($libID), $objectType, $docID);
$modulePairs = empty($libID) ? array() : $this->loadModel('tree')->getOptionMenu($libID, 'doc', 0);
$nestedDocs = $this->doc->buildNestedDocs($chapterAndDocs, $modulePairs);
$moduleItems = array_merge(array(array('text' => '/', 'value' => 0)), array_values($nestedDocs));
$moduleItems = array_merge(array(array('text' => '/', 'value' => 'm_0')), array_values($nestedDocs));
}
return print(json_encode(array('libs' => $libItems, 'modules' => $moduleItems)));
module/doc/ui/movedoc.html.php
+1 -1
View File
@@ -49,7 +49,7 @@ formPanel
(
set::width('5/6'),
set::label($lang->doc->module),
set::control(array('control' => "picker", 'name' => 'parent', 'items' => array(0 => '/') + $optionMenu, 'value' => empty($doc->parent) ? "m_{$doc->module}" : $doc->parent, 'required' => true))
set::control(array('control' => "picker", 'name' => 'parent', 'items' => array('m_0' => '/') + $optionMenu, 'value' => empty($doc->parent) ? "m_{$doc->module}" : $doc->parent, 'required' => true))
),
formGroup
(
module/doc/ui/setdocbasic.html.php
+2 -2
View File
@@ -90,8 +90,8 @@ formPanel
picker
(
set::name('parent'),
set::items($modalType != 'chapter' ? array(0 => '/') + $chapterAndDocs : $chapterAndDocs),
set::value($parentID ? $parentID : ($moduleID ? "m_$moduleID" : 0)),
set::items($modalType != 'chapter' ? array('m_0' => '/') + $chapterAndDocs : $chapterAndDocs),
set::value($parentID ? $parentID : "m_$moduleID"),
set::required(true)
),
) : null,
module/doc/ui/uploaddocs.html.php
+1 -1
View File
@@ -80,7 +80,7 @@ formPanel
setClass('moduleBox'),
set::label($lang->doc->module),
set::name('parent'),
set::items(array(0 => '/') + $optionMenu),
set::items(array('m_0' => '/') + $optionMenu),
set::value($moduleID ? "m_$moduleID" : 0),
set::required(true)
),