Fix for #2606 and saving new items on blueprints

Leantime · Aug 15, 2024 · 6764016 · 6764016
1 parent e987a99
commit 6764016
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 34 deletions.
diff --git a/app/Domain/Canvas/Controllers/BoardDialog.php b/app/Domain/Canvas/Controllers/BoardDialog.php
@@ -54,7 +54,7 @@ public function run()
                 $currentCanvasId = (int)$_GET['id'];
                 $singleCanvas = $this->canvasRepo->getSingleCanvas($currentCanvasId);
                 $canvasTitle = $singleCanvas[0]["title"] ?? "";
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             // Add Canvas
@@ -94,7 +94,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_created'), 'success', static::CANVAS_NAME . "board_created");
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/'.static::CANVAS_NAME.'canvas/boardDialog/'.$currentCanvasId);
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');

diff --git a/app/Domain/Canvas/Controllers/DelCanvas.php b/app/Domain/Canvas/Controllers/DelCanvas.php
@@ -49,7 +49,7 @@ public function run()
                 $this->canvasRepo->deleteCanvas($id);
 
                 $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $allCanvas[0]['id'] ?? -1]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $allCanvas[0]['id'] ?? -1]);
 
                 $this->tpl->setNotification($this->language->__('notification.board_deleted'), 'success', strtoupper(static::CANVAS_NAME) . 'canvas_deleted');
 

diff --git a/app/Domain/Canvas/Controllers/EditCanvasItem.php b/app/Domain/Canvas/Controllers/EditCanvasItem.php
@@ -154,6 +154,7 @@ public function post($params)
     {
 
         if (isset($params['changeItem'])) {
+
             if (isset($params['itemId']) && !empty($params['itemId'])) {
                 if (isset($params['description']) && !empty($params['description'])) {
                     $currentCanvasId = (int)session("current" . strtoupper(static::CANVAS_NAME) . "Canvas");

diff --git a/app/Domain/Canvas/Controllers/ShowCanvas.php b/app/Domain/Canvas/Controllers/ShowCanvas.php
@@ -73,26 +73,26 @@ public function run()
 
                 if (!$found) {
                     $currentCanvasId = -1;
-                    session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => '']);
+                    session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => '']);
                 }
             } else {
                 $currentCanvasId = -1;
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => '']);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => '']);
             }
 
             if (count($allCanvas) > 0 && session("current" . strtoupper(static::CANVAS_NAME) . "Canvas") == '') {
                 $currentCanvasId = $allCanvas[0]['id'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             if (isset($_GET['id']) === true) {
                 $currentCanvasId = (int)$_GET['id'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             if (isset($_REQUEST['searchCanvas']) === true) {
                 $currentCanvasId = (int)$_REQUEST['searchCanvas'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                 return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
             }
 
@@ -133,7 +133,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_created'), 'success', static::CANVAS_NAME . "board_created");
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');
@@ -174,7 +174,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_copied'), 'success');
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');
@@ -219,7 +219,7 @@ public function run()
                         if ($importCanvasId !== false) {
                             $currentCanvasId = $importCanvasId;
                             $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
-                            session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                            session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
 
                             $mailer = app()->make(MailerCore::class);
                             $this->projectService = app()->make(ProjectService::class);

diff --git a/app/Domain/Canvas/Templates/showCanvasBottom.inc.php b/app/Domain/Canvas/Templates/showCanvasBottom.inc.php
@@ -48,6 +48,10 @@
             new SlimSelect({ select: '#searchCanvas' });
         }
 
+        <?php if (isset($_GET['closeModal'])) { ?>
+            jQuery.nmTop().close();
+        <?php } ?>
+
         leantime.<?=$canvasName ?>CanvasController.setRowHeights();
         leantime.canvasController.setCanvasName('<?=$canvasName ?>');
         leantime.canvasController.initFilterBar();

diff --git a/app/Domain/Goalcanvas/Controllers/Dashboard.php b/app/Domain/Goalcanvas/Controllers/Dashboard.php
@@ -122,26 +122,26 @@ public function run()
 
                 if (!$found) {
                     $currentCanvasId = -1;
-                    session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => '']);
+                    session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => '']);
                 }
             } else {
                 $currentCanvasId = -1;
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => '']);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => '']);
             }
 
             if (count($allCanvas) > 0 && session("current" . strtoupper(static::CANVAS_NAME) . "Canvas") == '') {
                 $currentCanvasId = $allCanvas[0]['id'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             if (isset($_GET['id']) === true) {
                 $currentCanvasId = (int)$_GET['id'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             if (isset($_REQUEST['searchCanvas']) === true) {
                 $currentCanvasId = (int)$_REQUEST['searchCanvas'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                 return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
             }
 
@@ -182,7 +182,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_created'), 'success');
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');
@@ -223,7 +223,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_copied'), 'success');
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');
@@ -268,7 +268,7 @@ public function run()
                         if ($importCanvasId !== false) {
                             $currentCanvasId = $importCanvasId;
                             $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
-                            session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                            session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
 
                             $mailer = app()->make(Mailer::class);
                             $this->projectService = app()->make(Projects::class);

diff --git a/app/Domain/Goalcanvas/Controllers/DelCanvas.php b/app/Domain/Goalcanvas/Controllers/DelCanvas.php
@@ -48,7 +48,7 @@ public function run()
                 $this->canvasRepo->deleteCanvas($id);
 
                 $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $allCanvas[0]['id'] ?? -1]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $allCanvas[0]['id'] ?? -1]);
 
                 $this->tpl->setNotification($this->language->__('notification.board_deleted'), 'success', strtoupper(static::CANVAS_NAME) . 'canvas_deleted');
 

diff --git a/app/Domain/Goalcanvas/Controllers/ShowCanvas.php b/app/Domain/Goalcanvas/Controllers/ShowCanvas.php
@@ -75,26 +75,26 @@ public function run()
 
                 if (!$found) {
                     $currentCanvasId = -1;
-                    session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => '']);
+                    session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => '']);
                 }
             } else {
                 $currentCanvasId = -1;
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => '']);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => '']);
             }
 
             if (count($allCanvas) > 0 && session("current" . strtoupper(static::CANVAS_NAME) . "Canvas") == '') {
                 $currentCanvasId = $allCanvas[0]['id'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             if (isset($_GET['id']) === true) {
                 $currentCanvasId = (int)$_GET['id'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             if (isset($_REQUEST['searchCanvas']) === true) {
                 $currentCanvasId = (int)$_REQUEST['searchCanvas'];
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                 return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
             }
 
@@ -134,7 +134,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_created'), 'success');
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');
@@ -175,7 +175,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_copied'), 'success');
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/' . static::CANVAS_NAME . 'canvas/showCanvas/');
                     } else {
                         $this->tpl->setNotification($this->language->__('notification.board_exists'), 'error');
@@ -220,7 +220,7 @@ public function run()
                         if ($importCanvasId !== false) {
                             $currentCanvasId = $importCanvasId;
                             $allCanvas = $this->canvasRepo->getAllCanvas(session("currentProject"));
-                            session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                            session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
 
                             $mailer = app()->make(Mailer::class);
                             $users = $this->projectService->getUsersToNotify(session("currentProject"));

diff --git a/app/Domain/Ideas/Controllers/BoardDialog.php b/app/Domain/Ideas/Controllers/BoardDialog.php
@@ -55,7 +55,7 @@ public function run()
                 $currentCanvasId = (int)$_GET['id'];
                 $singleCanvas = $this->canvasRepo->getSingleCanvas($currentCanvasId);
                 $canvasTitle = $singleCanvas[0]["title"] ?? "";
-                session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
             }
 
             // Add Canvas
@@ -94,7 +94,7 @@ public function run()
 
                         $this->tpl->setNotification($this->language->__('notification.board_created'), 'success', static::CANVAS_NAME . "board_created");
 
-                        session(["current' . strtoupper(static::CANVAS_NAME) . 'Canvas" => $currentCanvasId]);
+                        session(['current' . strtoupper(static::CANVAS_NAME) . 'Canvas' => $currentCanvasId]);
                         return Frontcontroller::redirect(BASE_URL . '/ideas/boardDialog/'.$currentCanvasId);
 
                 } else {

diff --git a/app/Domain/Valuecanvas/Templates/canvasDialog.tpl.php b/app/Domain/Valuecanvas/Templates/canvasDialog.tpl.php
@@ -48,7 +48,7 @@
   <hr style="margin-top: 5px; margin-bottom: 15px;">
     <?php echo $tpl->displayNotification(); ?>
 
-    <form class="<?=$canvasName ?>CanvasModal" method="post" action="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasItem/<?php echo $id;?>">
+    <form class="formModal" method="post" action="<?=BASE_URL ?>/<?=$canvasName ?>canvas/editCanvasItem/<?php echo $id;?>">
 
         <input type="hidden" value="<?php echo $tpl->get('currentCanvas'); ?>" name="canvasId" />
         <input type="hidden" value="<?php $tpl->e($canvasItem['box']) ?>" name="box" id="box"/>
@@ -126,7 +126,9 @@
 
         <?php if ($login::userIsAtLeast($roles::$editor)) { ?>
             <input type="submit" value="<?=$tpl->__("buttons.save") ?>" id="primaryCanvasSubmitButton"/>
-            <input type="submit" value="<?=$tpl->__("buttons.save_and_close") ?>" id="saveAndClose" onclick="leantime.<?=$canvasName ?>CanvasController.setCloseModal();"/>
+            <button type="submit" class="btn btn-default" value="closeModal" id="saveAndClose" onclick="leantime.<?=$canvasName ?>CanvasController.setCloseModal();"><?=$tpl->__("buttons.save_and_close") ?></button>
+
+
         <?php } ?>
 
         <?php if ($id !== '') { ?>

diff --git a/public/assets/js/libs/jquery.nyroModal/js/jquery.nyroModal.custom.js b/public/assets/js/libs/jquery.nyroModal/js/jquery.nyroModal.custom.js
@@ -1456,7 +1456,7 @@ jQuery(function($, undefined) {
                     data: data,
                     type: nm.opener.attr('method') ? nm.opener.attr('method') : 'get',
                     success: function(data) {
-                        console.log(action);
+
                         if(action == "closeModal") {
                             nm.close();
                         }else{
@@ -1465,7 +1465,7 @@ jQuery(function($, undefined) {
 
                     },
                     error: function(content) {
-                        console.log(content);
+
                         nm._setCont(content.responseText);
                     }
                 });