fixes on assets

WildDogOne · Oct 26, 2013 · f4c03a4 · f4c03a4
1 parent a70f9cb
commit f4c03a4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/lib/Rails/ActiveRecord/ModelSchema.php b/lib/Rails/ActiveRecord/ModelSchema.php
@@ -38,7 +38,7 @@ public function setName($name)
 
     public function schemaFile()
     {
-        $path = Rails::root() . '/db/table_schema/' . $this->connection_name();
+        $path = Rails::root() . '/db/table_schema/' . $this->connection->name();
         $file = $path . '/' . $this->name . '.php';
         return $file;
     }
@@ -51,7 +51,7 @@ public function reloadSchema()
             $this->loadCachedSchema();
         } elseif (!$this->getSchema()) {
             throw new Exception\RuntimeException(
-                sprintf("Couldn't find schema for %s: %s", $this->name, $this->error_stmt)
+                sprintf("Couldn't find schema for %s", $this->name)
             );
         }
     }

diff --git a/lib/Rails/Panel/controllers/AdminController.php b/lib/Rails/Panel/controllers/AdminController.php
@@ -93,6 +93,12 @@ public function compileAssets()
                     Rails\Assets\Parser\Javascript\ClosureApi\ClosureApi::errorFile(), $e->getMessage());
 
                 $this->error = $message;
+            } catch (\Exception $e) {
+                /** 
+                 * If another error occurs, it won't be properly shown because of production config.
+                 */
+                Rails::resetConfig('development');
+                throw $e;
             }
 
             Rails::resetConfig('development');

diff --git a/lib/Rails/Rails.php b/lib/Rails/Rails.php
@@ -130,14 +130,11 @@ static public function assets()
 
             $prefix = str_replace('\\', '/', self::$config->assets->prefix);
 
-            $router = self::application()->router();
-            if (!$router || !$router->route() || !$router->route()->isPanelRoute()) {
-                $basePaths = [
-                    str_replace('\\', '/', Rails::config()->paths->application) . $prefix,
-                    str_replace('\\', '/', Rails::root() . '/lib') . $prefix,
-                    str_replace('\\', '/', Rails::root() . '/vendor') . $prefix,
-                ];
-            }
+            $basePaths = [
+                str_replace('\\', '/', Rails::config()->paths->application) . $prefix,
+                str_replace('\\', '/', Rails::root() . '/lib') . $prefix,
+                str_replace('\\', '/', Rails::root() . '/vendor') . $prefix,
+            ];
 
             $paths = [];