diff --git a/doraemon.spec b/doraemon.spec index 91261bf..a5b8237 100644 --- a/doraemon.spec +++ b/doraemon.spec @@ -147,7 +147,8 @@ rm -rf %{buildroot} * Mon Jul 18 2016 Paolo Asperti - 2.0.0-1 - PHP porting - Added a basic UI -- Added room support +- TODO prima di release: controllare se /var/log/doraemon viene creata, controllare se il link ad httpd viene creato + * Tue Oct 27 2015 Emiliano Vavassori - 1.2.1-2.ns6 - Packing corrections to rpm to fix upgrading issue diff --git a/root/usr/share/nethesis/NethServer/Language/en/NethServer_Module_Doraemon_Rooms.php b/root/usr/share/nethesis/NethServer/Language/en/NethServer_Module_Doraemon_Rooms.php deleted file mode 100644 index bc616fc..0000000 --- a/root/usr/share/nethesis/NethServer/Language/en/NethServer_Module_Doraemon_Rooms.php +++ /dev/null @@ -1,9 +0,0 @@ -setTableAdapter($this->getPlatform()->getTableAdapter('rooms', 'room')) - ->setColumns($columns) - ->addRowAction(new \NethServer\Module\Doraemon\Rooms\Modify('update')) - ->addRowAction(new \NethServer\Module\Doraemon\Rooms\Modify('delete')) - ->addTableAction(new \NethServer\Module\Doraemon\Rooms\Modify('create')) - ->addTableAction(new \Nethgui\Controller\Table\Help('Help')) - ; - - parent::initialize(); - } - -} diff --git a/root/usr/share/nethesis/NethServer/Module/Doraemon/Rooms/Modify.php b/root/usr/share/nethesis/NethServer/Module/Doraemon/Rooms/Modify.php deleted file mode 100644 index 6ee5e48..0000000 --- a/root/usr/share/nethesis/NethServer/Module/Doraemon/Rooms/Modify.php +++ /dev/null @@ -1,89 +0,0 @@ -setSchema($parameterSchema); - parent::initialize(); - } - - public function bind(\Nethgui\Controller\RequestInterface $request) - { - parent::bind($request); - if($request->isMutation()) { - // save the old values for later usage: - $this->originalAclRead = $this->getPlatform()->getDatabase('accounts')->getProp($this->parameters['ibay'], 'AclRead'); - $this->originalAclWrite = $this->getPlatform()->getDatabase('accounts')->getProp($this->parameters['ibay'], 'AclWrite'); - } - } - - public function validate(\Nethgui\Controller\ValidationReportInterface $report) - { - if ($this->getIdentifier() === 'delete') { - $v = $this->createValidator()->platform('room-delete'); - if ( ! $v->evaluate($this->parameters['name'])) { - $report->addValidationError($this, 'Key', $v); - } - } - parent::validate($report); - } - - protected function onParametersSaved($parameters) - { - $actionName = $this->getIdentifier(); - if ($actionName === 'update') { - $actionName = 'modify'; - } - $this->getPlatform()->signalEvent(sprintf('room-%s &', $actionName)); - } - - public function prepareView(\Nethgui\View\ViewInterface $view) - { - parent::prepareView($view); - $templates = array( - 'create' => 'NethServer\Template\Doraemon\Rooms', - 'update' => 'NethServer\Template\Doraemon\Rooms', - 'delete' => 'Nethgui\Template\Table\Delete', - ); - $view->setTemplate($templates[$this->getIdentifier()]); - - - $owners = array(array('locals', $view->translate('locals_group_label'))); - $subjects = array(array('locals', $view->translate('locals_group_label'))); - - foreach ($this->getPlatform()->getDatabase('accounts')->getAll('group') as $keyName => $props) { - $entry = array($keyName, sprintf("%s (%s)", isset($props['Description']) ? $props['Description'] : $keyName, $keyName)); - $owners[] = $entry; - $subjects[] = $entry; - } - - $view['OwningGroupDatasource'] = $owners; - - foreach ($this->getPlatform()->getDatabase('accounts')->getAll('user') as $keyName => $props) { - $entry = array($keyName, sprintf("%s (%s)", trim($props['FirstName'] . ' ' . $props['LastName']), $keyName)); - $subjects[] = $entry; - } - - $view['AclSubjects'] = $subjects; - - } - -} diff --git a/root/usr/share/nethesis/NethServer/Template/Doraemon/Rooms.php b/root/usr/share/nethesis/NethServer/Template/Doraemon/Rooms.php deleted file mode 100644 index 723c7ef..0000000 --- a/root/usr/share/nethesis/NethServer/Template/Doraemon/Rooms.php +++ /dev/null @@ -1,40 +0,0 @@ -requireFlag($view::INSET_FORM); - -if ($view->getModule()->getIdentifier() == 'update') { - // disable updating of hostname - // the hostname is the key of the db item, if you change it, bad things happens - $keyFlags = $view::STATE_DISABLED; - $template = 'Update_Room_Header'; -} else { - $keyFlags = 0; - $template = 'Create_Room_Header'; -} - -echo $view->header('doraemon')->setAttribute('template', $view->translate($template)); - -echo $view->panel() - ->insert($view->textInput('ibay', $keyFlags)) - ->insert($view->textInput('Description')) - ->insert($view->selector('OwningGroup', $view::SELECTOR_DROPDOWN)) - ->insert($view->checkBox('GroupAccess', 'rw')->setAttribute('uncheckedValue', 'r')) - ->insert($view->checkBox('OtherAccess', 'r')->setAttribute('uncheckedValue', '')) - ->insert($view->objectPicker() - ->setAttribute('objects', 'AclSubjects') - ->setAttribute('objectLabel', 1) - ->insert($view->checkBox('AclRead', FALSE, $view::STATE_CHECKED)) - ->insert($view->checkBox('AclWrite', FALSE)) -); - -echo $view->buttonList($view::BUTTON_SUBMIT | $view::BUTTON_CANCEL | $view::BUTTON_HELP); - -$actionId = $view->getUniqueId(); -$view->includeJavascript(" -jQuery(function($){ - $('#${actionId}').on('nethguishow', function () { - $(this).find('.Tabs').tabs('select', 0); - }); -}); -");