Merge pull request #480 from portabilis/portabilis-patch-2019-01-15

Portabilis patch 15/01/2019
portabilis · Jan 22, 2019 · 9a63c19 · 9a63c19
2 parents 929b978 + 3e147c6
commit 9a63c19
Show file tree

Hide file tree

Showing 22 changed files with 328 additions and 305 deletions.
diff --git a/app/Console/Commands/ReportsInstallCommand.php b/app/Console/Commands/ReportsInstallCommand.php
@@ -13,7 +13,7 @@ class ReportsInstallCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'reports:install';
+    protected $signature = 'reports:install {--no-compile}';
 
     /**
      * The console command description.
@@ -45,6 +45,7 @@ protected function getInitialReportsDatabaseFile()
     public function handle(Filesystem $filesystem, Connection $connection)
     {
         $file = $this->getInitialReportsDatabaseFile();
+        $compile = $this->option('no-compile') === false;
 
         if (!$filesystem->exists($file)) {
             $this->error('Initial reports database file not found.');
@@ -58,10 +59,13 @@ public function handle(Filesystem $filesystem, Connection $connection)
             $filesystem->get($file)
         );
 
-        $this->call('reports:compile');
+        if ($compile) {
+            $this->call('reports:compile');
+        }
 
         $this->call('migrate', [
-            '--force' => true
+            '--force' => true,
+            '--path' => 'ieducar/modules/Reports/database/migrations',
         ]);
     }
 }
diff --git a/app/Http/Controllers/LegacyController.php b/app/Http/Controllers/LegacyController.php
@@ -230,7 +230,7 @@ private function overrideGlobals()
         $_SERVER['REQUEST_URI'] = $_SERVER['REQUEST_URI'] ?? $this->request->getRequestUri();
 
         $_GET = empty($_GET) ? $this->request->query->all() : $_GET;
-        $_POST = empty($_POST) ? $this->request->request->all() : $_POST;
+        $_POST = (empty($_POST) && $this->request->isMethod('post')) ? $this->request->request->all() : $_POST;
         $_FILES = empty($_FILES) ? $this->request->files->all() : $_FILES;
         $_COOKIE = empty($_COOKIE) ? $this->request->cookies->all() : $_COOKIE;
     }

diff --git a/composer.json b/composer.json
@@ -3,7 +3,7 @@
     "description": "Software livre de gestão escolar",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "keywords": [
         "Portabilis",
         "i-Educar"