Merge pull request #754 from wa7eedem/5.4.0

change cms_users to config var
crocodic-studio · Aug 21, 2017 · 581e32a · 581e32a
2 parents 86d312f + 6b3c066
commit 581e32a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/controllers/LogsController.php b/src/controllers/LogsController.php
@@ -30,15 +30,15 @@ public function cbInit() {
 		$this->col = array();
 		$this->col[] = array("label"=>"Time Access","name"=>"created_at");
 		$this->col[] = array("label"=>"IP Address","name"=>"ipaddress");
-		$this->col[] = array("label"=>"User","name"=>"id_cms_users","join"=>"cms_users,name");
+        $this->col[] = array("label"=>"User","name"=>"id_cms_users","join"=>config('crudbooster.USER_TABLE').",name");
 		$this->col[] = array("label"=>"Description","name"=>"description");
 
 		$this->form = array();
 		$this->form[] = array("label"=>"Time Access","name"=>"created_at","readonly"=>true);
 		$this->form[] = array("label"=>"IP Address","name"=>"ipaddress","readonly"=>true);
 		$this->form[] = array("label"=>"User Agent","name"=>"useragent","readonly"=>true);
 		$this->form[] = array("label"=>"URL","name"=>"url","readonly"=>true);
-		$this->form[] = array("label"=>"User","name"=>"id_cms_users","type"=>"select","datatable"=>"cms_users,name","readonly"=>true);
+        $this->form[] = array("label"=>"User","name"=>"id_cms_users","type"=>"select","datatable"=>config('crudbooster.USER_TABLE').",name","readonly"=>true);
 		$this->form[] = array("label"=>"Description","name"=>"description","readonly"=>true);
 		$this->form[] = array("label"=>"Details","name"=>"details","type"=>"custom");
 

diff --git a/src/controllers/ModulsController.php b/src/controllers/ModulsController.php
@@ -154,7 +154,7 @@ public function getStep1($id=0) {
 			foreach ($tab as $key => $value) {	
 				$label = $value;	
 
-				if(substr($label, 0,4) == 'cms_' && $label != 'cms_users') continue;
+				if(substr($label, 0,4) == 'cms_' && $label != config('crudbooster.USER_TABLE')) continue;
 				if($label == 'migrations') continue;
 
 				$tables_list[] = $value;