Merge pull request #2226 from Leantime/clearTemplatePathCache

update db no matter what...
Leantime · Jan 18, 2024 · e82eaeb · e82eaeb
2 parents c93766d + f47f2b8
commit e82eaeb
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 22 deletions.
diff --git a/app/Core/AppSettings.php b/app/Core/AppSettings.php
@@ -11,10 +11,10 @@
 class AppSettings
 {
 
-    public string $appVersion = "3.0.1";
+    public string $appVersion = "3.0.2";
 
 
-    public string $dbVersion = "2.4.7";
+    public string $dbVersion = "3.0.2";
 
     /**
      * __construct

diff --git a/app/Domain/Install/Repositories/Install.php b/app/Domain/Install/Repositories/Install.php
@@ -99,6 +99,7 @@ class Install
             20405,
             20406,
             20407,
+            30002,
         );
 
         /**
@@ -289,6 +290,10 @@ public function updateDB(): array|bool
             }
 
             if ($currentDBVersion == $newDBVersion) {
+
+                unset($_SESSION['isUpdated']);
+                unset($_SESSION['dbVersion']);
+
                 return true;
             }
 
@@ -321,6 +326,9 @@ public function updateDB(): array|bool
                 }
             }
 
+            unset($_SESSION['isUpdated']);
+            unset($_SESSION['dbVersion']);
+
             return true;
         }
 
@@ -1870,5 +1878,29 @@ public function update_sql_20407(): bool|array
             }
         }
 
+        public function update_sql_30002(): bool|array {
+
+            $errors = array();
+
+            $sql = [
+                "ALTER TABLE `zp_plugins` ADD COLUMN `license` TEXT NULL DEFAULT NULL",
+                "ALTER TABLE `zp_plugins` ADD COLUMN `format` VARCHAR(45) NULL DEFAULT NULL",
+            ];
+
+            foreach ($sql as $statement) {
+                try {
+                    $stmn = $this->database->prepare($statement);
+                    $stmn->execute();
+                } catch (PDOException $e) {
+                   //Just swallow your pride
+                    //One day we'll get ALTER IF EXISTS
+                }
+            }
+
+
+            return true;
+
+        }
+
     }
 }
diff --git a/app/Domain/Menu/Templates/headMenu.blade.php b/app/Domain/Menu/Templates/headMenu.blade.php
@@ -7,7 +7,11 @@
     @include('timesheets::partials.stopwatch', [
                'progressSteps' => $onTheClock
            ])
-
+    @if ($login::userIsAtLeast("admin"))
+        <li>
+            <a href="{{ BASE_URL }}/plugins/marketplace" data-tippy-content="{{ __('menu.leantime_apps_tooltip') }}"><span class="fa fa-puzzle-piece"></span></a>
+        </li>
+    @endif
     <li class="notificationDropdown">
         <a
             class="dropdown-toggle profileHandler newsDropDownHandler"

diff --git a/app/Domain/Timesheets/Hxcontrollers/Stopwatch.php b/app/Domain/Timesheets/Hxcontrollers/Stopwatch.php
@@ -87,7 +87,9 @@ public function startTimer(): void
 
         if (isset($params["action"]) === true && $params["action"] == "start") {
             $ticketId = filter_var($params["ticketId"], FILTER_SANITIZE_NUMBER_INT);
-            $this->timesheetService->punchIn($ticketId);
+            if($ticketId > 0){
+                $this->timesheetService->punchIn($ticketId);
+            }
         }
 
         $onTheClock = isset($_SESSION['userdata']) ? $this->timesheetService->isClocked($_SESSION["userdata"]["id"]) : false;

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "leantime/leantime",
     "description": "Open source project management system",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "type": "project",
     "config": {
         "platform-check": false,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leantime",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Open source innovation management system",
   "dependencies": {
     "@assuradeurengilde/fontawesome-iconpicker": "^3.2.3",

diff --git a/public/dist/mix-manifest.json b/public/dist/mix-manifest.json
@@ -1,18 +1,18 @@
 {
-    "/js/compiled-htmx.3.0.1.min.js": "/js/compiled-htmx.3.0.1.min.js",
-    "/css/main.3.0.1.min.css": "/css/main.3.0.1.min.css",
-    "/css/editor.3.0.1.min.css": "/css/editor.3.0.1.min.css",
-    "/css/app.3.0.1.min.css": "/css/app.3.0.1.min.css",
-    "/js/compiled-footer.3.0.1.min.js": "/js/compiled-footer.3.0.1.min.js",
-    "/js/compiled-app.3.0.1.min.js": "/js/compiled-app.3.0.1.min.js",
-    "/js/compiled-frameworks.3.0.1.min.js": "/js/compiled-frameworks.3.0.1.min.js",
-    "/js/compiled-framework-plugins.3.0.1.min.js": "/js/compiled-framework-plugins.3.0.1.min.js",
-    "/js/compiled-global-component.3.0.1.min.js": "/js/compiled-global-component.3.0.1.min.js",
-    "/js/compiled-calendar-component.3.0.1.min.js": "/js/compiled-calendar-component.3.0.1.min.js",
-    "/js/compiled-table-component.3.0.1.min.js": "/js/compiled-table-component.3.0.1.min.js",
-    "/js/compiled-editor-component.3.0.1.min.js": "/js/compiled-editor-component.3.0.1.min.js",
-    "/js/compiled-gantt-component.3.0.1.min.js": "/js/compiled-gantt-component.3.0.1.min.js",
-    "/js/compiled-chart-component.3.0.1.min.js": "/js/compiled-chart-component.3.0.1.min.js",
+    "/js/compiled-htmx.3.0.2.min.js": "/js/compiled-htmx.3.0.2.min.js",
+    "/css/main.3.0.2.min.css": "/css/main.3.0.2.min.css",
+    "/css/editor.3.0.2.min.css": "/css/editor.3.0.2.min.css",
+    "/css/app.3.0.2.min.css": "/css/app.3.0.2.min.css",
+    "/js/compiled-footer.3.0.2.min.js": "/js/compiled-footer.3.0.2.min.js",
+    "/js/compiled-app.3.0.2.min.js": "/js/compiled-app.3.0.2.min.js",
+    "/js/compiled-frameworks.3.0.2.min.js": "/js/compiled-frameworks.3.0.2.min.js",
+    "/js/compiled-framework-plugins.3.0.2.min.js": "/js/compiled-framework-plugins.3.0.2.min.js",
+    "/js/compiled-global-component.3.0.2.min.js": "/js/compiled-global-component.3.0.2.min.js",
+    "/js/compiled-calendar-component.3.0.2.min.js": "/js/compiled-calendar-component.3.0.2.min.js",
+    "/js/compiled-table-component.3.0.2.min.js": "/js/compiled-table-component.3.0.2.min.js",
+    "/js/compiled-editor-component.3.0.2.min.js": "/js/compiled-editor-component.3.0.2.min.js",
+    "/js/compiled-gantt-component.3.0.2.min.js": "/js/compiled-gantt-component.3.0.2.min.js",
+    "/js/compiled-chart-component.3.0.2.min.js": "/js/compiled-chart-component.3.0.2.min.js",
     "/images/03-1.png": "/images/03-1.png",
     "/images/32px.png": "/images/32px.png",
     "/images/40px.png": "/images/40px.png",
@@ -28,6 +28,7 @@
     "/images/Screenshots/Home.png": "/images/Screenshots/Home.png",
     "/images/Screenshots/Ideas.png": "/images/Screenshots/Ideas.png",
     "/images/Screenshots/Kanban2.png": "/images/Screenshots/Kanban2.png",
+    "/images/Screenshots/LeanCanvas.png": "/images/Screenshots/LeanCanvas.png",
     "/images/Screenshots/Leancanvas.png": "/images/Screenshots/Leancanvas.png",
     "/images/Screenshots/Milestones.png": "/images/Screenshots/Milestones.png",
     "/images/Screenshots/MyProjects.png": "/images/Screenshots/MyProjects.png",
@@ -66,6 +67,7 @@
     "/images/chosen-sprite-light.png": "/images/chosen-sprite-light.png",
     "/images/[email protected]": "/images/[email protected]",
     "/images/chosen-sprite.png": "/images/chosen-sprite.png",
+    "/images/close.gif": "/images/close.gif",
     "/images/close.png": "/images/close.png",
     "/images/controls.png": "/images/controls.png",
     "/images/default-user.png": "/images/default-user.png",
@@ -86,12 +88,15 @@
     "/images/logo_blue.png": "/images/logo_blue.png",
     "/images/logo_blue.svg": "/images/logo_blue.svg",
     "/images/mattermost-logoHorizontal.png": "/images/mattermost-logoHorizontal.png",
+    "/images/next.gif": "/images/next.gif",
     "/images/onboarding/canvasScreen.png": "/images/onboarding/canvasScreen.png",
     "/images/onboarding/ideaScreen.png": "/images/onboarding/ideaScreen.png",
     "/images/onboarding/retroScreen.png": "/images/onboarding/retroScreen.png",
     "/images/onboarding/roadmapScreen.png": "/images/onboarding/roadmapScreen.png",
     "/images/onboarding/todoScreen.png": "/images/onboarding/todoScreen.png",
     "/images/openid-icon.png": "/images/openid-icon.png",
+    "/images/prev.gif": "/images/prev.gif",
+    "/images/registrationBg.png": "/images/registrationBg.png",
     "/images/spotlightBg.png": "/images/spotlightBg.png",
     "/images/svg/30h/logo.png": "/images/svg/30h/logo.png",
     "/images/svg/SVG/logo.svg": "/images/svg/SVG/logo.svg",
@@ -102,6 +107,7 @@
     "/images/svg/undraw_Organizing_projects_0p9a.svg": "/images/svg/undraw_Organizing_projects_0p9a.svg",
     "/images/svg/undraw_a_moment_to_relax_bbpa.svg": "/images/svg/undraw_a_moment_to_relax_bbpa.svg",
     "/images/svg/undraw_adjustments_p22m.svg": "/images/svg/undraw_adjustments_p22m.svg",
+    "/images/svg/undraw_adventure_map_hnin.svg": "/images/svg/undraw_adventure_map_hnin.svg",
     "/images/svg/undraw_air_support_re_nybl.svg": "/images/svg/undraw_air_support_re_nybl.svg",
     "/images/svg/undraw_blooming_re_2kc4.svg": "/images/svg/undraw_blooming_re_2kc4.svg",
     "/images/svg/undraw_book_reading_re_fu2c.svg": "/images/svg/undraw_book_reading_re_fu2c.svg",
@@ -111,6 +117,7 @@
     "/images/svg/undraw_complete_task_u2c3.svg": "/images/svg/undraw_complete_task_u2c3.svg",
     "/images/svg/undraw_dark_mode_2xam.svg": "/images/svg/undraw_dark_mode_2xam.svg",
     "/images/svg/undraw_design_data_khdb.svg": "/images/svg/undraw_design_data_khdb.svg",
+    "/images/svg/undraw_donut_love_kau1.svg": "/images/svg/undraw_donut_love_kau1.svg",
     "/images/svg/undraw_events_2p66.svg": "/images/svg/undraw_events_2p66.svg",
     "/images/svg/undraw_fans_re_cri3.svg": "/images/svg/undraw_fans_re_cri3.svg",
     "/images/svg/undraw_game_day_ucx9.svg": "/images/svg/undraw_game_day_ucx9.svg",
@@ -138,6 +145,7 @@
     "/images/svg/undraw_team_spirit_hrr4.svg": "/images/svg/undraw_team_spirit_hrr4.svg",
     "/images/svg/undraw_thought_process_re_om58.svg": "/images/svg/undraw_thought_process_re_om58.svg",
     "/images/svg/undraw_time_management_30iu.svg": "/images/svg/undraw_time_management_30iu.svg",
+    "/images/svg/undraw_treasure_of-9-i.svg": "/images/svg/undraw_treasure_of-9-i.svg",
     "/images/svg/undraw_welcome_re_h3d9.svg": "/images/svg/undraw_welcome_re_h3d9.svg",
     "/images/svg/undraw_welcoming_re_x0qo.svg": "/images/svg/undraw_welcoming_re_x0qo.svg",
     "/images/throbber.gif": "/images/throbber.gif",