Added enableNotes option

d3yii2 · Mar 16, 2021 · 31e5a98 · 31e5a98
1 parent 585c03e
commit 31e5a98
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 58 deletions.
diff --git a/D3Files.php b/D3Files.php
@@ -23,6 +23,7 @@ class D3Files extends Module
     public $sharedLeftLoadings;
     public $imageExtensions = ['jpg', 'gif', 'png', 'bmp'];
     public $models = [];
+    public $enableNotes;
 
     public function init()
     {
@@ -46,5 +47,4 @@ public function getView($view)
         $this->viewPath or $this->viewPath = __DIR__ . '/views';
         return $this->viewPath . '/' . $view . '.php';
     }
-
 }
diff --git a/assets/js/d3files.js b/assets/js/d3files.js
@@ -202,10 +202,12 @@ $(function () {
     });
 
     d.on("click", ".d3files-save-notes", function () {
-        let widget = $(this).closest(".d3files-widget");
+        let saveBtn = $(this);
+        let widget = saveBtn.closest(".d3files-widget");
         let alert = widget.find(".d3files-alert");
-        let textarea = $(this).prev(".d3files-notes-field");
+        let textarea = saveBtn.prev(".d3files-notes-field");
         let notes = textarea ? textarea.val() : false;
+        let row = saveBtn.closest("tr.d3files-row-notes");
         let url;
 
         alert.remove();
@@ -217,7 +219,8 @@ $(function () {
             data: {notes: notes},
             success: function (data) {
                 showSuccess(data, widget);
-                textarea.closest("tr.d3files-row-notes").hide();
+                row.prev('tr').find(".d3files-notes-text").text(notes);
+                row.hide();
             },
             error: function (xhr) {
                 showError(xhr.responseJSON, widget);

diff --git a/components/D3Files.php b/components/D3Files.php
@@ -228,4 +228,12 @@ public static function copyFilesBetweenModels(ActiveRecord $modelFrom, ActiveRec
 
         return true;
     }
+
+    /**
+     * @return mixed|object|null
+     */
+    public function isNotesEnabled()
+    {
+        return Yii::$app->getModule('d3files')->enableNotes;
+    }
 }
diff --git a/messages/lv-LV/d3files.php b/messages/lv-LV/d3files.php
@@ -18,7 +18,9 @@
  */
 return [
     'Attachment error' => 'Pielikuma kļūda',
+    'Edit notes' => 'Rediģēt piezīmi',
     'Cannot upload the file' => 'Failu neizdevās augšuplādēt',
+    'File Notes updated' => 'Faila piezīme saglabāta',
     'File uploaded successfully.' => 'Fails veiksmīgi augšuplādēts',
     'File not uploaded.' => 'Fails netika augšuplādēts',
     'File too large' => 'Faila izmērs pārsniedz atļauto',
@@ -53,6 +55,7 @@
     'Preview atachment' => 'Priekšskatīt pielikumu',
     'Previous Attachment' => 'Iepriekšējais pielikums',
     'Next Attachment' => 'Nākamais pielikums',
+    'Save Note' => 'Saglabāt piezīmi',
     'Select attachment' => 'Izvēlies pielikumu',
     'Selected attachments' => 'Izvēlēti pielikumi',
     'Type ID' => 'Tips',

diff --git a/views/d3files/_list_table.php b/views/d3files/_list_table.php
@@ -21,62 +21,67 @@
     foreach ($fileList as $file) {
         if (!D3Files::hasFileWithExtension([$file], $viewByExtensions)) {
             continue;
-        }
-
-        ?><tr><td class="col-xs-10"><?=
-            Html::a(
-                '<i class="fa fa-cloud-download text-primary"></i> ' . $file['file_name'],
-                Url::to([
-                    $urlPrefix . 'd3filesdownload',
-                    'id' => $file['file_model_id'],
-                    'model_name' => $model_name,
-                ]),
-                [
-                    'data-title' => Yii::t('d3files', 'Download'),
-                    'data-placement' => 'top',
-                    'data-toggle' => 'tooltip',
-                    'class' => 'text-primary',
-                ]
-            ) ?></td><td class="col-xs-1"><?php
-
-        if (isset($previewExtensions, $previewFileList) && D3Files::fileHasExtension($file, $previewExtensions)) {
-            echo $this->render($previewButton, compact('icon', 'file', 'previewFileList'));
-        }
-        if ($actionColumn && is_callable($actionColumn)) {
-            echo $actionColumn($file);
-        } ?></td><td class="text-center col-xs-1"><?php
-        if (!$readOnly) {
-            echo Html::a(
-                '<span class="glyphicon glyphicon-trash"></span>',
-                [
-                    $urlPrefix . 'd3filesdelete',
-                    'id' => $file['file_model_id'],
-                    'model_name' => $model_name,
-                ],
-                [
-                    'data-title' => Yii::t('d3files', 'Delete'),
-                    'data-placement' => 'top',
-                    'data-toggle' => 'tooltip',
-                    'class' => 'd3files-delete text-primary',
-                ]
-            );
-        }
-        ?></td>
-        <?php if (!$readOnly): ?>
-            <td>
-            <?= Html::a(
-                '<span class="glyphicon glyphicon-book"></span>',
-                '#',
-                [
-                    'onclick' => 'event.preventDefault()',
-                    'data-title' => Yii::t('d3files', 'Edit notes'),
-                    'data-placement' => 'top',
-                    'data-toggle' => 'tooltip',
-                    'class' => 'd3files-edit-notes text-primary',
-                ]
-            ) ?>
+        } ?>
+        <tr>
+            <td class="col-xs-10"><?=
+                Html::a(
+                    '<i class="fa fa-cloud-download text-primary"></i> ' . $file['file_name'],
+                    Url::to([
+                        $urlPrefix . 'd3filesdownload',
+                        'id' => $file['file_model_id'],
+                        'model_name' => $model_name,
+                    ]),
+                    [
+                        'data-title' => Yii::t('d3files', 'Download'),
+                        'data-placement' => 'top',
+                        'data-toggle' => 'tooltip',
+                        'class' => 'text-primary',
+                    ]
+                ) ?>
             </td>
+            <?php if (!$readOnly && $enableNotes): ?>
+                <td class="d3files-notes-text"><?= $file['notes'] ?></td>
+                <td>
+                    <?= Html::a(
+                        '<span class="glyphicon glyphicon-book"></span>',
+                        '#',
+                        [
+                            'onclick' => 'event.preventDefault()',
+                            'data-title' => Yii::t('d3files', 'Edit notes'),
+                            'data-placement' => 'top',
+                            'data-toggle' => 'tooltip',
+                            'class' => 'd3files-edit-notes text-primary',
+                        ]
+                    ) ?>
+                </td>
             <?php endif; ?>
+            <td class="col-xs-1"><?php
+                if (isset($previewExtensions, $previewFileList) && D3Files::fileHasExtension($file, $previewExtensions)) {
+                    echo $this->render($previewButton, compact('icon', 'file', 'previewFileList'));
+                }
+                if ($actionColumn && is_callable($actionColumn)) {
+                    echo $actionColumn($file);
+                } ?>
+            </td>
+            <td class="text-center col-xs-1"><?php
+                if (!$readOnly) {
+                    echo Html::a(
+                        '<span class="glyphicon glyphicon-trash"></span>',
+                        [
+                            $urlPrefix . 'd3filesdelete',
+                            'id' => $file['file_model_id'],
+                            'model_name' => $model_name,
+                        ],
+                        [
+                            'data-title' => Yii::t('d3files', 'Delete'),
+                            'data-placement' => 'top',
+                            'data-toggle' => 'tooltip',
+                            'class' => 'd3files-delete text-primary',
+                        ]
+                    );
+                }
+                ?>
+            </td>
         </tr>
         <?php
         if (!$readOnly): ?>

diff --git a/widgets/D3FilesWidget.php b/widgets/D3FilesWidget.php
@@ -47,6 +47,7 @@ class D3FilesWidget extends D3Widget
     public $readOnly = false;
     // File handling controller route. If empty, then use actual controller
     public $controllerRoute = '';
+    public $enableNotes;
 
     /**
      * @deprecated $viewByFancyBox
@@ -111,6 +112,11 @@ public function init(): void
             $this->urlPrefix = $this->controllerRoute;
         }
 
+        // Check default settting from module if not specified
+        if (null === $this->enableNotes) {
+            $this->enableNotes = D3Files::isNotesEnabled();
+        }
+
         $this->initFilesList();
 
         if (!$this->readOnly) {
@@ -177,6 +183,7 @@ public function getViewParams(): ?array
             'readOnly' => $this->readOnly,
             'uploadButtonPlacement' => $this->uploadButtonPlacement,
             'allowUpload' => $this->allowUpload,
+            'enableNotes' => $this->enableNotes,
         ];
     }