Merge branch 'main' into feature/doctemplate

2024-11-28 01:06:07 +00:00
parent 39c8f8b45d b8166a07eb
commit fcab4e34ef
275 changed files with 10928 additions and 1466 deletions
@@ -2624,6 +2624,7 @@ eof;
     */
    protected function checkPrivForOperateAction(array $actionData, string $action, string $moduleName, object $data, string $menu): array|bool
    {
+        $rawModule = $moduleName;
        if(!empty($actionData['url']) && is_array($actionData['url']))
        {
            $moduleName = ($actionData['url']['module'] == 'story' && in_array($moduleName, array('epic', 'requirement', 'story'))) ? $data->type : $actionData['url']['module'];
@@ -2650,6 +2651,7 @@ eof;
            if(!common::hasPriv($moduleName, $action, $data)) return false;
        }

+        if(!empty($actionData['notLoadModel']) && $moduleName != $rawModule) $moduleName = $rawModule;
        if(!isset($this->$moduleName)) $this->loadModel($moduleName);
        if(isset($this->$moduleName) && method_exists($this->{$moduleName}, 'isClickable') && false === $this->{$moduleName}->isClickable($data, $action)) return false;
        if(!empty($actionData['hint']) && !isset($actionData['text'])) $actionData['text'] = $actionData['hint'];