Merge pull request #305 from eve-seat/dev

Merge v0.12.3 into master
eve-seat · Dec 29, 2014 · 62d5171 · 62d5171
2 parents 96ee40c + a54d9d5
commit 62d5171
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/config/seat.php b/app/config/seat.php
@@ -32,7 +32,7 @@
     |
     */
 
-    'version' => '0.12.2',
+    'version' => '0.12.3',
 
     /*
     |--------------------------------------------------------------------------

diff --git a/app/controllers/DashboardController.php b/app/controllers/DashboardController.php
@@ -65,7 +65,7 @@ public function getSearch()
             |--------------------------------------------------------------------------
             */
 
-            if(!Auth::isSuperUser() || empty(Session::get('valid_keys')))
+            if(!Auth::isSuperUser() && count(Session::get('valid_keys')) <= 0)
                 return View::make('layouts.components.flash')
                     ->withErrors('No API Keys are defined to show you any information. Please enter at least one.');
 
@@ -227,8 +227,8 @@ public function getSearch()
                 ->join('invTypes', 'a.typeID', '=', 'invTypes.typeID');
 
             // If the user is not a superuser, filter the results down to keys they own
-            if (!\Auth::isSuperUser() )
-                $corporation_assets = $corporation_assets->whereIn('corporation_assetlist.corporationID', Session::get('corporation_affiliations'));
+            if (!\Auth::hasAccess('asset_manager'))
+                $corporation_assets = $corporation_assets->whereIn('a.corporationID', Session::get('corporation_affiliations'));
 
             // Complete the search
             $corporation_assets = $corporation_assets->where('invTypes.typeName', 'like', '%' . Input::get('q') . '%')

diff --git a/composer.json b/composer.json
@@ -27,6 +27,7 @@
 	},
 	"scripts": {
 		"post-install-cmd": [
+			"php -r \"copy('app/config/env-sample.php', '.env.php');\"",
 			"php artisan clear-compiled",
 			"php artisan optimize"
 		],