Fix showSimpleMessage error

Fix phpMv/ubiquity#49
phpMv · Jun 27, 2019 · 52a5478 · 52a5478
1 parent d68db23
commit 52a5478
Show file tree

Hide file tree

Showing 13 changed files with 495 additions and 413 deletions.
diff --git a/src/Ubiquity/controllers/admin/traits/CheckTrait.php b/src/Ubiquity/controllers/admin/traits/CheckTrait.php
diff --git a/src/Ubiquity/controllers/admin/traits/ConfigTrait.php b/src/Ubiquity/controllers/admin/traits/ConfigTrait.php
@@ -34,7 +34,7 @@ abstract protected function reloadConfig();
 
 	abstract protected function showConfMessage($content, $type, $title, $icon, $url, $responseElement, $data, $attributes = NULL): HtmlMessage;
 
-	abstract protected function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null): HtmlMessage;
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
 
 	public function formConfig($hasHeader = true) {
 		global $config;

diff --git a/src/Ubiquity/controllers/admin/traits/ControllersTrait.php b/src/Ubiquity/controllers/admin/traits/ControllersTrait.php
@@ -36,7 +36,7 @@ abstract protected function _createController($controllerName, $variables = [],
 
 	abstract protected function _addMessageForRouteCreation($path);
 
-	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null): HtmlMessage;
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
 
 	public function createController($force = null) {
 		if (URequest::isPost()) {

diff --git a/src/Ubiquity/controllers/admin/traits/DatabaseTrait.php b/src/Ubiquity/controllers/admin/traits/DatabaseTrait.php
@@ -13,63 +13,72 @@
 use Ajax\semantic\html\collections\HtmlMessage;
 
 /**
+ *
  * @author jc
  * @property \Ajax\JsUtils $jquery
  */
-trait DatabaseTrait{
+trait DatabaseTrait {
+
 	abstract public function _getAdminData();
+
 	abstract public function _getAdminViewer();
+
 	abstract public function _getFiles();
-	abstract public function loadView($viewName, $pData=NULL, $asString=false);
-	abstract protected function showSimpleMessage($content, $type, $title=null,$icon="info", $timeout=NULL, $staticName=null):HtmlMessage;
 
-	protected function getModels(){
-		$config=Startup::getConfig();
-		$models=CacheManager::getModels($config,true);
-		$result=[];
-		foreach ($models as $model){
-			$table=OrmUtils::getTableName($model);
-			$simpleM=ClassUtils::getClassSimpleName($model);
-			if($simpleM!==$table)
-				$result[$table]=$simpleM."[".$table."]";
+	abstract public function loadView($viewName, $pData = NULL, $asString = false);
+
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
+
+	protected function getModels() {
+		$config = Startup::getConfig();
+		$models = CacheManager::getModels($config, true);
+		$result = [];
+		foreach ($models as $model) {
+			$table = OrmUtils::getTableName($model);
+			$simpleM = ClassUtils::getClassSimpleName($model);
+			if ($simpleM !== $table)
+				$result[$table] = $simpleM . "[" . $table . "]";
 			else
-				$result[$table]=$simpleM;
+				$result[$table] = $simpleM;
 		}
 		return $result;
 	}
 
-	public function createSQLScript(){
-		if(URequest::isPost()){
-			$db=$_POST["dbName"];
-			if(DAO::isConnected()){
-				$actualDb=DAO::$db->getDbName();
+	public function createSQLScript() {
+		if (URequest::isPost()) {
+			$db = $_POST["dbName"];
+			if (DAO::isConnected()) {
+				$actualDb = DAO::$db->getDbName();
 			}
-			$generator=new DatabaseReversor(new DbGenerator());
+			$generator = new DatabaseReversor(new DbGenerator());
 			$generator->createDatabase($db);
-			$frm=$this->jquery->semantic()->htmlForm("form-sql");
-			$text=$frm->addElement("sql", $generator->__toString(),"SQL script","div","ui segment editor");
+			$frm = $this->jquery->semantic()->htmlForm("form-sql");
+			$text = $frm->addElement("sql", $generator->__toString(), "SQL script", "div", "ui segment editor");
 			$text->getField()->setProperty("style", "background-color: #002B36;");
-			$bts=$this->jquery->semantic()->htmlButtonGroups("buttons");
+			$bts = $this->jquery->semantic()->htmlButtonGroups("buttons");
 			$bts->addElement("Generate database")->addClass("green");
-			if(isset($actualDb) && $actualDb!==$db){
-				$btExport=$bts->addElement("Export datas script : ".$actualDb." => ".$db);
+			if (isset($actualDb) && $actualDb !== $db) {
+				$btExport = $bts->addElement("Export datas script : " . $actualDb . " => " . $db);
 				$btExport->addIcon("exchange");
-				$btExport->postOnClick($this->_getFiles()->getAdminBaseRoute()."/exportDatasScript","{}","#div-datas");
+				$btExport->postOnClick($this->_getFiles()
+					->getAdminBaseRoute() . "/exportDatasScript", "{}", "#div-datas");
 			}
 			$frm->addDivider();
-			$this->jquery->exec("setAceEditor('sql');",true);
+			$this->jquery->exec("setAceEditor('sql');", true);
 			$this->jquery->compile($this->view);
-			$this->loadView($this->_getFiles()->getViewDatabaseCreate());
+			$this->loadView($this->_getFiles()
+				->getViewDatabaseCreate());
 		}
 	}
 
-	public function exportDatasScript(){
-		$dbExport=new DbExport();
-		$frm=$this->jquery->semantic()->htmlForm("form-sql-datas");
-		$text=$frm->addElement("datas-sql", $dbExport->exports(),"Datas export script","div","ui segment editor");
+	public function exportDatasScript() {
+		$dbExport = new DbExport();
+		$frm = $this->jquery->semantic()->htmlForm("form-sql-datas");
+		$text = $frm->addElement("datas-sql", $dbExport->exports(), "Datas export script", "div", "ui segment editor");
 		$text->getField()->setProperty("style", "background-color: #002B36;");
-		$this->jquery->exec("setAceEditor('datas-sql');",true);
+		$this->jquery->exec("setAceEditor('datas-sql');", true);
 		$this->jquery->compile($this->view);
-		$this->loadView($this->_getFiles()->getViewDatasExport());
+		$this->loadView($this->_getFiles()
+			->getViewDatasExport());
 	}
 }
diff --git a/src/Ubiquity/controllers/admin/traits/GitTrait.php b/src/Ubiquity/controllers/admin/traits/GitTrait.php
@@ -34,7 +34,7 @@ abstract public function git();
 
 	abstract protected function showConfMessage($content, $type, $itle, $icon, $url, $responseElement, $data, $attributes = NULL): HtmlMessage;
 
-	abstract protected function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null): HtmlMessage;
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
 
 	public function gitRefresh() {
 		echo $this->_git();

diff --git a/src/Ubiquity/controllers/admin/traits/LogsTrait.php b/src/Ubiquity/controllers/admin/traits/LogsTrait.php
@@ -29,7 +29,7 @@ abstract protected function reloadConfig();
 
 	abstract protected function showConfMessage($content, $type, $title, $icon, $url, $responseElement, $data, $attributes = NULL): HtmlMessage;
 
-	abstract protected function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null): HtmlMessage;
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
 
 	public function logsRefresh() {
 		$maxLines = URequest::post("maxLines", null);

diff --git a/src/Ubiquity/controllers/admin/traits/MaintenanceTrait.php b/src/Ubiquity/controllers/admin/traits/MaintenanceTrait.php
@@ -34,7 +34,7 @@ abstract public function loadView($viewName, $pData = NULL, $asString = false);
 
 	abstract protected function showConfMessage($content, $type, $title, $icon, $url, $responseElement, $data, $attributes = NULL): HtmlMessage;
 
-	abstract protected function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null): HtmlMessage;
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
 
 	protected function _displayActiveMaintenance(MaintenanceMode $maintenance) {
 		$semantic = $this->jquery->semantic();

diff --git a/src/Ubiquity/controllers/admin/traits/ModelsTrait.php b/src/Ubiquity/controllers/admin/traits/ModelsTrait.php
@@ -41,7 +41,7 @@ abstract public function _getModelViewer();
 
 	abstract public function _getFiles();
 
-	abstract protected function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null): HtmlMessage;
+	abstract public function showSimpleMessage($content, $type, $title = null, $icon = "info", $timeout = NULL, $staticName = null, $closeAction = null): HtmlMessage;
 
 	abstract public function showConfMessage($content, $type, $title, $icon, $url, $responseElement, $data, $attributes = NULL): HtmlMessage;