From 563dfd10d55690169a75768fed85a55d6b7b0a71 Mon Sep 17 00:00:00 2001 From: liugang Date: Tue, 1 Aug 2023 14:50:35 +0800 Subject: [PATCH] * convert: display notice message below the dbName control. --- module/convert/control.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/module/convert/control.php b/module/convert/control.php index 281f3a79ac..a7bacff2fa 100644 --- a/module/convert/control.php +++ b/module/convert/control.php @@ -265,9 +265,9 @@ class convert extends control if($method == 'db') { $dbName = $this->post->dbName; - if(!$dbName) return $this->send(array('result' => 'fail', 'message' => $this->lang->convert->jira->dbNameEmpty)); - if(!$this->convert->dbExists($dbName)) return $this->send(array('result' => 'fail', 'message' => $this->lang->convert->jira->invalidDB)); - if(!$this->convert->tableExistsOfJira($dbName, 'nodeassociation')) return $this->send(array('result' => 'fail', 'message' => $this->lang->convert->jira->invalidTable)); + if(!$dbName) return $this->send(array('result' => 'fail', 'message' => array('dbName' => sprintf($this->lang->error->notempty, $this->lang->convert->jira->database)))); + if(!$this->convert->dbExists($dbName)) return $this->send(array('result' => 'fail', 'message' => array('dbName' => $this->lang->convert->jira->invalidDB))); + if(!$this->convert->tableExistsOfJira($dbName, 'nodeassociation')) return $this->send(array('result' => 'fail', 'message' => array('dbName' => $this->lang->convert->jira->invalidTable))); $this->session->set('jiraDB', $dbName); $link = $this->createLink('convert', 'mapJira2Zentao', "method=db&dbName={$this->post->dbName}"); @@ -281,8 +281,8 @@ class convert extends control if(!file_exists($jiraFilePath . 'entities.xml')) return $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->convert->jira->notExistEntities, $jiraFilePath . 'entities.xml'))); $this->convert->splitFile(); - $link = $this->createLink('convert', 'mapJira2Zentao', "method=file"); + $link = $this->createLink('convert', 'mapJira2Zentao', 'method=file'); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $link)); }