Merge pull request #276 from wtom/model-path-config

Model path config

Author: Serverfire

src/Serverfireteam/Panel/Commands/CreateModelCommand.php

@@ -54,7 +54,12 @@ public function fire()
 	 */
 	protected function getDefaultNamespace($rootNamespace)
 	{
-		return $rootNamespace;
+		if (!empty(\Config::get('panel.modelPath'))) {
+			return $rootNamespace . '\\' . \Config::get('panel.modelPath');
+		}
+		else {
+			return $rootNamespace;
+		}
 	}
 
 }

src/Serverfireteam/Panel/config/panel.php

@@ -13,8 +13,8 @@
        'Role',  
        'Link'
     ),
-    'logo'=>'packages/serverfireteam/panel/img/logo.png' // logo of Panel 
-    
+    'logo'=>'packages/serverfireteam/panel/img/logo.png', // logo of Panel 
+    'modelPath' => '', // specific model path in the app folder e.g. 'Models'
 );
 
 

src/Serverfireteam/Panel/libs/AppHelper.php

@@ -15,14 +15,29 @@ public function getNameSpace(){
     }
 
     public static function validName($name) {
-	return strpos($name, '.') !== 0;
+	   return strpos($name, '.') !== 0;
     }
 
     public static function access($attr, $path, $data, $volume) {
-	if (strpos(basename($path), '.') === 0) {
-	        return !($attr == 'read');
-	} else {
-	        return null;
-	}
+    	if (strpos(basename($path), '.') === 0) {
+    	        return !($attr == 'read');
+    	} else {
+    	        return null;
+    	}
+    }
+
+    public function getModel($entity) {
+        if ( in_array($entity, \Serverfireteam\Panel\Link::getMainUrls()) ) {
+            $modelClass = 'Serverfireteam\\Panel\\'.$entity;
+        } else {
+            if (!empty(\Config::get('panel.modelPath'))) {
+                $modelClass = $this->getNameSpace() . \Config::get('panel.modelPath') . '\\' . $entity;
+            }
+            else {
+                $modelClass = $this->getNameSpace() . $entity;
+            }
+            
+        }
+        return $modelClass;
     }
 }

src/Serverfireteam/Panel/libs/dashboard.php

@@ -30,13 +30,15 @@ public static function create()
         // Make Dashboard Items
         foreach ($config as $value) {
 
-            $modelName = $value['url'];
-
+    	    $modelName = $value['url'];
+            /*
             if ( in_array($modelName, self::$urls)) {
                $model = "Serverfireteam\\Panel\\".$modelName;
             } else {
                $model = $appHelper->getNameSpace() . $modelName;
             }
+            */
+            $model = $appHelper->getModel($modelName);
 
             //if (class_exists($value)) {
             if($value['show_menu'])

src/controllers/CrudController.php

@@ -59,11 +59,7 @@ public function getEntityModel() {
 
         $appHelper = new libs\AppHelper;
 
-        if ( in_array($entity, Link::getMainUrls()) ) {
-            $modelClass = 'Serverfireteam\\Panel\\'.$entity;
-        } else {
-            $modelClass = $appHelper->getNameSpace().$this->getEntity();
-        }
+        $modelClass = $appHelper->getModel($entity);
 
         return new $modelClass;
     }

src/controllers/ExportImportController.php

@@ -13,7 +13,7 @@ public function export($entity, $fileType) {
 
         $appHelper = new libs\AppHelper();
 
-	$className = $appHelper->getNameSpace() . $entity;
+	$className = $appHelper->getModel($entity);
 	$data      = $className::get();
 	if (strcmp($fileType, "excel") == 0) {
 		$excel = \App::make('Excel');
@@ -29,7 +29,7 @@ public function import($entity) {
 
         $appHelper = new libs\AppHelper();
 
-	$className = $appHelper->getNameSpace() . $entity;
+	$className = $appHelper->getModel($entity);
 	$model     = new $className;
 	$table     = $model->getTable();
 	$columns   = \Schema::getColumnListing($table);

src/controllers/LinkController.php

@@ -39,7 +39,7 @@ public function edit($entity) {
         Link::creating(function($link)
         {
             $appHelper = new libs\AppHelper();
-            return ( class_exists( $appHelper->getNameSpace() . $link['url'] ));
+            return ( class_exists( $appHelper->getModel($link['url']) ));
         });
 
         $helpMessage = \Lang::get('panel::fields.links_help');