libs/phplibrary
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'noglob' of http://gitlab.edu.yar.ru/composer/PHP_Library into noglob

Browse source
This commit is contained in:
CORP\phedor 2018-05-04 14:58:29 +03:00
commit 706e12c06f
3 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Controller/Action.php
View file

@ -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);

6
src/Form/BrowserInput.php Normal file
View file

@ -0,0 +1,6 @@
<?php
namespace ctiso\Form;
use ctiso\Form\Input;
class BrowserInput extends Input {
}

31
src/Form/Form.php
View file

@ -50,9 +50,6 @@ class THidden extends Input {
public $hidden = true;
}
class TComponentBrowserInput extends Input {
}
/**
* Форма для ввода
*/
@ -77,30 +74,30 @@ class Form extends View {
public function __construct()
{
$this->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',
);
}