Updated dependencies

bluzphp · Oct 3, 2018 · 00848f5 · 00848f5
1 parent 8120a8c
commit 00848f5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/application/modules/media/config.php → application/configs/default/module.media.php b/application/modules/media/config.php → application/configs/default/module.media.php
diff --git a/application/models/Media/Manager.php b/application/models/Media/Manager.php
@@ -81,7 +81,7 @@ public function __construct($media, $file)
      */
     public function moveToDir($directory)
     {
-        $uploadPath = Config::getModuleData('media', 'upload_path');
+        $uploadPath = Config::get('module.media', 'upload_path');
 
         if (empty($uploadPath)) {
             throw new ConfigException('Upload path is not configured');

diff --git a/application/modules/media/views/grid.phtml b/application/modules/media/views/grid.phtml
@@ -42,7 +42,7 @@ if (!$grid) {
   <hr style="display: block; clear: both"/>
   <div class="card-deck">
     <?php foreach ($grid->getData() as $row) : ?>
-    <div class="card mb-3" style="min-width: 240px; max-width: 240px">
+    <div class="card mb-3">
       <a href="<?= $this->baseUrl($row['file']) ?>" data-ajax-preview>
         <img class="card-img-top" src="<?= $this->baseUrl($row['thumb']) ?>" alt="<?= esc($row['title']) ?>">
       </a>

diff --git a/public/css/media.css b/public/css/media.css
@@ -23,4 +23,15 @@
   max-height: 480px;
   overflow-y: scroll;
   border: 2px dashed rgba(0, 0, 0, 0.1);
+}
+
+.card-deck .card {
+  min-width: 240px;
+  max-width: 240px
+}
+
+.card-deck .card-img-top {
+  /*display: block;
+  min-width: 196px;
+  max-width: 196px*/
 }
diff --git a/tests/unit/modules/media/controllers/CrudTest.php b/tests/unit/modules/media/controllers/CrudTest.php
@@ -54,7 +54,7 @@ public static function tearDownAfterClass()
         self::getApp();
         {
             Db::delete('media')->where('userId = ?', 1)->execute();
-            $path = Config::getModuleData('media', 'upload_path').'/1';
+            $path = Config::get('module.media', 'upload_path').'/1';
             Tools\Cleaner::delete($path);
         }
         self::resetApp();
@@ -67,7 +67,7 @@ public static function tearDownAfterClass()
     public function testUploadFile()
     {
         // get path from config
-        $path = Config::getData('temp', 'path');
+        $path = Config::get('temp', 'path');
         if (empty($path)) {
             throw new Exception('Temporary path is not configured');
         }