From a1267da4cc20115e14d6d24c37f69cbee5b3188f Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Tue, 10 Dec 2024 15:28:23 +0800 Subject: [PATCH] * [task#134214,doing,0.5h] adjust server room data. --- module/serverroom/config/search.php | 4 ---- module/serverroom/control.php | 28 +++++++--------------------- module/serverroom/ui/browse.html.php | 2 -- module/serverroom/ui/create.html.php | 8 ++------ module/serverroom/ui/edit.html.php | 8 ++------ 5 files changed, 11 insertions(+), 39 deletions(-) diff --git a/module/serverroom/config/search.php b/module/serverroom/config/search.php index e3272fde07..dc50b6f220 100644 --- a/module/serverroom/config/search.php +++ b/module/serverroom/config/search.php @@ -4,10 +4,8 @@ global $lang; $config->serverroom->search['module'] = 'serverroom'; $config->serverroom->search['fields']['name'] = $lang->serverroom->name; $config->serverroom->search['fields']['id'] = 'ID'; -$config->serverroom->search['fields']['city'] = $lang->serverroom->city; $config->serverroom->search['fields']['line'] = $lang->serverroom->line; $config->serverroom->search['fields']['bandwidth'] = $lang->serverroom->bandwidth; -$config->serverroom->search['fields']['provider'] = $lang->serverroom->provider; $config->serverroom->search['fields']['owner'] = $lang->serverroom->owner; $config->serverroom->search['fields']['createdBy'] = $lang->serverroom->createdBy; $config->serverroom->search['fields']['createdDate'] = $lang->serverroom->createdDate; @@ -16,10 +14,8 @@ $config->serverroom->search['fields']['editedDate'] = $lang->serverroom->edited $config->serverroom->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); $config->serverroom->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => ''); -$config->serverroom->search['params']['city'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->serverroom->cityList); $config->serverroom->search['params']['line'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->serverroom->lineList); $config->serverroom->search['params']['bandwidth'] = array('operator' => 'include', 'control' => 'input', 'values' => ''); -$config->serverroom->search['params']['provider'] = array('operator' => '=', 'control' => 'select', 'values' => $lang->serverroom->providerList); $config->serverroom->search['params']['owner'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->serverroom->search['params']['createdBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users'); $config->serverroom->search['params']['createdDate'] = array('operator' => '=', 'control' => 'date', 'values' => ''); diff --git a/module/serverroom/control.php b/module/serverroom/control.php index 36f32ae811..8b230c947d 100644 --- a/module/serverroom/control.php +++ b/module/serverroom/control.php @@ -66,10 +66,10 @@ class serverroom extends control ->add('createdBy', $this->app->user->account) ->get(); $createID = $this->serverroom->create($room); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + if(dao::isError()) return $this->sendError(dao::getError()); $this->loadModel('action')->create('serverRoom', $createID, 'created'); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $this->createLink('serverroom', 'browse'))); + return $this->sendSuccess(array('load' => $this->createLink('serverroom', 'browse'))); } $this->view->title = $this->lang->serverroom->create; @@ -93,7 +93,7 @@ class serverroom extends control ->add('editedBy', $this->app->user->account) ->get(); $changes = $this->serverroom->update($roomID, $room); - if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError())); + if(dao::isError()) return $this->sendError(dao::getError()); if($changes) { @@ -101,16 +101,12 @@ class serverroom extends control $this->action->logHistory($actionID, $changes); } - $loadUrl = $this->app->tab == 'devops' ? true : $this->createLink('serverroom', 'view', "room=$roomID"); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => $loadUrl)); + return $this->sendSuccess(array('load' => inLink('browse'))); } $this->view->title = $this->lang->serverroom->edit; $this->view->serverRoom = $this->serverroom->fetchByID($roomID); - $this->view->position[] = html::a($this->createLink('serverroom', 'browse'), $this->lang->serverroom->common); - $this->view->position[] = $this->lang->serverroom->edit; - - $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed'); + $this->view->users = $this->loadModel('user')->getPairs('noletter|nodeleted|noclosed'); $this->display(); } @@ -143,18 +139,8 @@ class serverroom extends control public function delete(int $roomID) { $this->serverroom->delete(TABLE_SERVERROOM, $roomID); + if(dao::isError()) return $this->sendError(dao::getError()); - if(dao::isError()) - { - $response['result'] = 'fail'; - $response['message'] = dao::getError(); - } - else - { - $response['result'] = 'success'; - $response['message'] = ''; - $response['load'] = true; - } - return $this->send($response); + return $this->sendSuccess(array('message' => $this->lang->deleteSuccess)); } } diff --git a/module/serverroom/ui/browse.html.php b/module/serverroom/ui/browse.html.php index 54708306f0..9bd4f47ac9 100644 --- a/module/serverroom/ui/browse.html.php +++ b/module/serverroom/ui/browse.html.php @@ -47,5 +47,3 @@ dtable set::orderBy($orderBy), set::footPager(usePager()) ); - -render(); diff --git a/module/serverroom/ui/create.html.php b/module/serverroom/ui/create.html.php index 40f7ee6cb4..3bdc7835dd 100644 --- a/module/serverroom/ui/create.html.php +++ b/module/serverroom/ui/create.html.php @@ -38,9 +38,7 @@ formPanel ( set::width('1/2'), set::label($lang->serverroom->city), - set::control('picker'), - set::name('city'), - set::items($lang->serverroom->cityList) + set::name('city') ) ), formRow @@ -60,9 +58,7 @@ formPanel ( set::width('1/2'), set::label($lang->serverroom->provider), - set::control('picker'), - set::name('provider'), - set::items($lang->serverroom->providerList) + set::name('provider') ) ), formRow diff --git a/module/serverroom/ui/edit.html.php b/module/serverroom/ui/edit.html.php index 9cb7a684f5..44fe8727ce 100644 --- a/module/serverroom/ui/edit.html.php +++ b/module/serverroom/ui/edit.html.php @@ -43,10 +43,8 @@ formPanel ( set::width('300px'), set::label($lang->serverroom->city), - set::control('picker'), set::name('city'), - set::items($lang->serverroom->cityList), - set::value($serverRoom->city) + set::value(zget($lang->serverroom->cityList, $serverRoom->city)) ) ), formRow @@ -67,10 +65,8 @@ formPanel ( set::width('300px'), set::label($lang->serverroom->provider), - set::control('picker'), set::name('provider'), - set::items($lang->serverroom->providerList), - set::value($serverRoom->provider) + set::value(zget($lang->serverroom->providerList, $serverRoom->provider)) ) ), formRow