diff --git a/src/Controller/Action.php b/src/Controller/Action.php index 34137af..a86511b 100644 --- a/src/Controller/Action.php +++ b/src/Controller/Action.php @@ -219,11 +219,8 @@ class Action $url = new Url(); if ($access == null || $access->checkAction($name)) { - $param = array_merge(array( - 'module' => strtr($this->modulePrefix . strtolower(get_class($this)), array('module_' => '')), - "action" => $name - - ), $param); + $moduleName = explode("\\", strtolower(get_class($this)), 2); + $param = array_merge(array('module' => $this->modulePrefix . $moduleName[1], "action" => $name), $param); $url->setParent($this->part); $url->setQuery($param); diff --git a/src/Form/BrowserInput.php b/src/Form/BrowserInput.php new file mode 100644 index 0000000..f6e1e69 --- /dev/null +++ b/src/Form/BrowserInput.php @@ -0,0 +1,6 @@ +constructor = array( - 'input' => 'Form_Input', - 'inputreq' => 'Form_Input', // input с проверкой на заполненность + 'input' => 'ctiso\\Form\\Input', + 'inputreq' => 'ctiso\\Form\\Input', // input с проверкой на заполненность - 'date' => 'Form_Date', - 'datereq' => 'Form_Date', + 'date' => 'ctiso\\Form\\Date', + 'datereq' => 'ctiso\\Form\\Date', 'datetime' => 'TDateTime', - 'color' => 'Form_Color', - 'textarea' => 'Form_TextArea', - 'text' => 'Form_TextArea', - 'multiselect' => 'Form_SelectMany', + 'color' => 'ctiso\\Form\\Color', + 'textarea' => 'ctiso\\Form\\TextArea', + 'text' => 'ctiso\\Form\\TextArea', + 'multiselect' => 'ctiso\\Form\\SelectMany', // 'selectmany' => 'TSelectMany', - 'select1' => 'Form_SelectOne', - 'select' => 'Form_SelectOne', + 'select1' => 'ctiso\\Form\\SelectOne', + 'select' => 'ctiso\\Form\\SelectOne', 'questiontype'=> 'TQuestionType', 'secret' => 'TSecret', 'upload' => 'TUpload', 'image' => 'TUpload', 'checkbox' => 'TCheckbox', - 'checkmany' => 'Form_SelectMany', + 'checkmany' => 'ctiso\\Form\\SelectMany', 'hidden' => 'THidden', - 'radio' => 'Form_SelectOne', - 'filebrowser' => 'TComponentBrowserInput', - 'documents' => 'TComponentBrowserInput', + 'radio' => 'ctiso\\Form\\SelectOne', + 'filebrowser' => 'ctiso\\Form\\BrowserInput', + 'documents' => 'ctiso\\Form\\BrowserInput', ); }