A few fixes (snipe#3437)

* This method was renamed, so we need to rename the eager load * Readd tinker to the composer dev packages. * Update sql dump for functional tests.
dmeltzer · Mar 31, 2017 · 1bb89db · 1bb89db
1 parent 7ee1728
commit 1bb89db
Show file tree

Hide file tree

Showing 5 changed files with 354 additions and 13 deletions.
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
@@ -41,7 +41,7 @@ public function getIndex()
     {
 
         $user = User::with(
-            'assignedAssets.model',
+            'assets.model',
             'consumables',
             'accessories',
             'licenses',

diff --git a/composer.json b/composer.json
@@ -34,7 +34,8 @@
         "symfony/css-selector": "3.1.*",
         "symfony/dom-crawler": "3.1.*",
         "codeception/codeception": "2.2.9",
-        "squizlabs/php_codesniffer": "*"
+        "squizlabs/php_codesniffer": "*",
+    "laravel/tinker": "^1.0"
     },
     "autoload": {
         "classmap": [

diff --git a/composer.lock b/composer.lock
diff --git a/config/app.php b/config/app.php
@@ -219,6 +219,7 @@
         Fideloper\Proxy\TrustedProxyServiceProvider::class,
         PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
         Laravel\Passport\PassportServiceProvider::class,
+        Laravel\Tinker\TinkerServiceProvider::class,
 
 
         /*