Merge pull request #1764 from Leantime/release-fixes

Fixed multiple release issues
Leantime · Jul 22, 2023 · 8cda6c3 · 8cda6c3
2 parents 3a9f13f + ffc36f1
commit 8cda6c3
Show file tree

Hide file tree

Showing 24 changed files with 111 additions and 42 deletions.
diff --git a/app/core/class.events.php b/app/core/class.events.php
@@ -125,8 +125,6 @@ public static function discover_listeners()
             $enabledPlugins = $pluginService->getEnabledPlugins();
         }
 
-        //var_dump($enabledPlugins); exit;
-
         foreach ($enabledPlugins as $plugin) {
             if (file_exists($pluginPath . $plugin->foldername . "/register.php")) {
                 include $pluginPath . $plugin->foldername . "/register.php";

diff --git a/app/domain/api/controllers/class.users.php b/app/domain/api/controllers/class.users.php
@@ -54,7 +54,6 @@ public function get($params)
             }
 
             if (isset($params["profileImage"])) {
-                //var_dump("asdf");
 
                 $return = $this->usersService->getProfilePicture($params["profileImage"]);
 

diff --git a/app/domain/menu/js/menuController.js b/app/domain/menu/js/menuController.js
@@ -185,7 +185,7 @@ leantime.menuController = (function () {
 
         var activeProgramParent = jQuery(".programList .activeChild").attr("data-program-id");
         var activeStrategyParent = jQuery(".strategyList .activeChild").attr("data-strategy-id");
-        var activeParent = '';
+        var activeParent = 'noparent';
 
         if(activeStrategyParent !== undefined && activeStrategyParent !== ''){
             activeParent = activeStrategyParent;

diff --git a/app/domain/pageparts/js/generalController.js b/app/domain/pageparts/js/generalController.js
@@ -87,9 +87,7 @@ leantime.generalController = (function () {
                 width: "100%",
                 skin_url: leantime.appUrl + '/assets/css/libs/tinymceSkin/oxide',
                 content_css: leantime.appUrl + '/theme/' + leantime.theme + '/css/theme.css,'
-                    + leantime.appUrl + '/assets/css/libs/tinymceSkin/oxide/content.css,'
-                    + leantime.appUrl + '/assets/css/components/wysiwyg-overrides.css,'
-                    + leantime.appUrl + '/assets/css/libs/roboto.css',
+                    + leantime.appUrl + '/dist/css/editor.' + leantime.version + '.min.css',
                 content_style: "body.mce-content-body{ font-size:14px; } img { max-width: 100%; }",
                 plugins : "imagetools,shortlink,checklist,table,emoticons,autolink,image,lists,save,media,searchreplace,paste,directionality,fullscreen,noneditable,visualchars,advlist,mention,slashcommands",
                 toolbar : "bold italic strikethrough | link unlink image | checklist bullist numlist | emoticons",
@@ -195,8 +193,6 @@ leantime.generalController = (function () {
 
                         var placeholder = editor.getDoc().getElementsByClassName("tinyPlaceholder");
 
-                        console.log(placeholder);
-
                         if (placeholder.length > 0) {
 
                             while(placeholder[0]) {
@@ -205,7 +201,6 @@ leantime.generalController = (function () {
                             }
                             editor.save();
 
-                            console.log(editor.getDoc());
                         }
                     });
                 }
@@ -227,13 +222,8 @@ leantime.generalController = (function () {
                 // General options
                 width: "100%",
                 skin_url: leantime.appUrl + '/assets/css/libs/tinymceSkin/oxide',
-                content_css: leantime.appUrl + '/assets/css/components/style.default.css,'
-                    + leantime.appUrl + '/assets/css/components/dropdowns.css,'
-                    + leantime.appUrl + '/assets/css/libs/bootstrap-grid.min.css,'
-                    + leantime.appUrl + '/theme/' + leantime.theme + '/css/theme.css,'
-                    + leantime.appUrl + '/assets/css/libs/tinymceSkin/oxide/content.css,'
-                    + leantime.appUrl + '/assets/css/components/wysiwyg-overrides.css,'
-                    + leantime.appUrl + '/assets/css/libs/roboto.css',
+                content_css: leantime.appUrl + '/theme/' + leantime.theme + '/css/theme.css,'
+                    + leantime.appUrl + '/dist/css/editor.' + leantime.version + '.min.css',
                 content_style: "body.mce-content-body{ font-size:14px; } img { max-width: 100%; }",
                 plugins : "imagetools,embed,autoresize,shortlink,checklist,bettertable,table,emoticons,autolink,image,lists,save,media,searchreplace,paste,directionality,fullscreen,noneditable,visualchars,advancedTemplate,advlist,codesample,mention,slashcommands",
                 toolbar : "bold italic strikethrough | formatselect forecolor | alignleft aligncenter alignright | link unlink image media embed emoticons | checklist bullist numlist | table  | codesample | advancedTemplate",
@@ -386,9 +376,7 @@ leantime.generalController = (function () {
                 width: "100%",
                 skin_url: leantime.appUrl + '/assets/css/libs/tinymceSkin/oxide',
                 content_css: leantime.appUrl + '/theme/' + leantime.theme + '/css/theme.css,'
-                    + leantime.appUrl + '/assets/css/libs/tinymceSkin/oxide/content.css,'
-                    + leantime.appUrl + '/assets/css/components/wysiwyg-overrides.css,'
-                    + leantime.appUrl + '/assets/css/libs/roboto.css',
+                    + leantime.appUrl + '/dist/css/editor.' + leantime.version + '.min.css',
                 content_style: "body.mce-content-body{ font-size:14px; } img { max-width: 100%; }",
                 height:"400",
                 content_style: "body.mce-content-body{ font-size:14px; } img { max-width: 100%; }",

diff --git a/app/domain/pageparts/templates/header.tpl.php b/app/domain/pageparts/templates/header.tpl.php
@@ -17,6 +17,7 @@
 <meta name="theme-color" content="<?php $this->e($_SESSION["companysettings.primarycolor"]) ?>">
 <meta name="color-scheme" content="<?php $this->e($theme ?? 'default') ?>">
 <meta name="identifier-URL" content="<?=BASE_URL?>">
+<meta name="leantime-version" content="<?=$settings->appVersion ?>">
 <?php $this->dispatchTplEvent('afterMetaTags'); ?>
 
 <link rel="shortcut icon" href="<?=BASE_URL?>/dist/images/favicon.png"/>

diff --git a/app/domain/projects/controllers/class.newProject.php b/app/domain/projects/controllers/class.newProject.php
@@ -94,7 +94,7 @@ public function run()
                     'state' => $_POST['projectState'],
                     'psettings' => $_POST['globalProjectUserAccess'],
                     'menuType' => $_POST['menuType'] ?? 'default',
-                    'type' => 'project',
+                    'type' => $_POST['type']  ?? 'project',
                     'parent' => $_POST['parent'] ?? '',
                     'start' => $this->language->getISODateString($_POST['start']),
                     'end' => $_POST['end'] ? $this->language->getISODateString($_POST['end']) : ''
@@ -150,6 +150,8 @@ public function run()
             $this->tpl->assign('project', $values);
             $this->tpl->assign('availableUsers', $this->userRepo->getAll());
             $this->tpl->assign('clients', $this->clientsRepo->getAll());
+            $this->tpl->assign('projectTypes', $this->projectService->getProjectTypes());
+
             $this->tpl->assign('info', $msgKey);
 
             $this->tpl->display('projects.newProject');

diff --git a/app/domain/projects/controllers/class.showProject.php b/app/domain/projects/controllers/class.showProject.php
@@ -65,6 +65,8 @@ public function run()
         {
 
             if (isset($_GET['id']) === true) {
+                $projectTypes = $this->projectService->getProjectTypes();
+
                 $id = (int)($_GET['id']);
 
                 //Mattermost integration
@@ -330,6 +332,7 @@ public function run()
                 $this->tpl->assign('numComments', $this->commentsRepo->countComments('project', $_GET['id']));
 
                 $this->tpl->assign('menuTypes', $this->menuRepo->getMenuTypes());
+                $this->tpl->assign('projectTypes', $projectTypes);
 
                 $this->tpl->assign('state', $this->projectRepo->state);
                 $this->tpl->assign('role', $_SESSION['userdata']['role']);

diff --git a/app/domain/projects/repositories/class.projects.php b/app/domain/projects/repositories/class.projects.php
@@ -54,6 +54,7 @@ public function __construct()
             $this->db = core\db::getInstance();
         }
 
+
         /**
          * getAll - get all projects open and closed
          *
@@ -612,6 +613,7 @@ public function editProject(array $values, $id)
 				dollarBudget = :dollarBudget,
 				psettings = :psettings,
 				menuType = :menuType,
+				type = :type,
 				parent = :parent,
 				start = :start,
 				end = :end
@@ -629,6 +631,7 @@ public function editProject(array $values, $id)
             $stmn->bindValue('dollarBudget', $values['dollarBudget'], PDO::PARAM_STR);
             $stmn->bindValue('psettings', $values['psettings'], PDO::PARAM_STR);
             $stmn->bindValue('menuType', $values['menuType'], PDO::PARAM_STR);
+            $stmn->bindValue('type', $values['type'] ?? 'project', PDO::PARAM_STR);
             $stmn->bindValue('id', $id, PDO::PARAM_STR);
             $stmn->bindValue('parent', $values['parent'] ?? null, PDO::PARAM_STR);
 
@@ -1131,12 +1134,15 @@ public function getProjectAvatar($id)
                         ->font(ROOT . '/dist/fonts/roboto/Roboto-Regular.woff2')
                         ->fontSize(0.5)
                         ->size(96)
-                        ->background('#555555')->color("#fff")
-                        ->generate();
+                        ->background('#555555')->color("#fff");
 
-                    $image->save(APP_ROOT."/cache/avatars/".$imagename.".png", 100, "png");
+                    if(is_writable(APP_ROOT."/cache/avatars/")) {
+                        $image->generate()->save(APP_ROOT . "/cache/avatars/" . $imagename . ".png", 100, "png");
+                        return array("filename"=>APP_ROOT."/cache/avatars/".$imagename.".png", "type"=>"generated");
+                    }else{
 
-                    return array("filename"=>APP_ROOT."/cache/avatars/".$imagename.".png", "type"=>"generated");
+                        return $image->generateSVG();;
+                    }
 
                 }
 

diff --git a/app/domain/projects/services/class.projects.php b/app/domain/projects/services/class.projects.php
@@ -41,6 +41,24 @@ public function __construct()
             $this->notificationService = new notifications();
         }
 
+        public function getProjectTypes() {
+
+            $types = array("project"=>"label.project");
+
+            $filtered = static::dispatch_filter("filterProjectType", $types);
+
+            //Strategy & Program are protected types
+            if(isset($filtered["strategy"])){
+                unset($filtered["strategy"]);
+            }
+
+            if(isset($filtered["program"])){
+                unset($filtered["program"]);
+            }
+
+            return $filtered;
+        }
+
         public function getProject($id)
         {
             return $this->projectRepository->getProject($id);
@@ -320,6 +338,10 @@ public function getProjectHierarchyAssignedToUser($userId, $projectStatus = "ope
                 //IF the pgm module is not active, add all items
                 if($projectHierarchy['program']["enabled"] === false) {
                     if ($project['type'] != "program" && $project['type'] != "strategy") {
+
+                        if($project['parent'] == 0 || $project['parent'] == '' || $project['parent'] == null){
+                            $project['parent'] = "noparent";
+                        }
                         $projectHierarchy["project"]["items"]['project'][$project['id']] = $project;
                     }
                 } else {

diff --git a/app/domain/projects/templates/newProject.tpl.php b/app/domain/projects/templates/newProject.tpl.php
@@ -73,6 +73,19 @@
 
                         <div class="span4">
 
+                            <?php if($this->get('projectTypes') && count($this->get('projectTypes')) > 1) {?>
+                                <h4 class="widgettitle title-light"><i class="fa-regular fa-rectangle-list"></i> Project Type</h4>
+                                <p>The type of the project. This will determine which features are available.</p>
+                                <select name="type">
+                                    <?php foreach($this->get('projectTypes') as $key => $type){ ?>
+                                        <option value="<?=$this->escape($key)?>"
+                                            <?php if($project['type'] == $key) echo " selected='selected' "; ?>
+                                        ><?=$this->__($this->escape($type))?></option>
+                                    <?php } ?>
+                                </select>
+                                <br /><br />
+                            <?php } ?>
+
                             <?php $this->dispatchTplEvent("beforeClientPicker", $project) ?>
 
                             <div class="row-fluid marginBottom">

diff --git a/app/domain/projects/templates/submodules/projectDetails.sub.php b/app/domain/projects/templates/submodules/projectDetails.sub.php
@@ -38,6 +38,21 @@
         <div class="span4">
 
             <div class="row-fluid marginBottom">
+
+                <?php if($this->get('projectTypes') && count($this->get('projectTypes')) > 1) {?>
+                    <h4 class="widgettitle title-light"><i class="fa-regular fa-rectangle-list"></i> Project Type</h4>
+                    <p>The type of the project. This will determine which features are available.</p>
+                    <select name="type">
+                        <?php foreach($this->get('projectTypes') as $key => $type){ ?>
+                            <option value="<?=$this->escape($key)?>"
+                            <?php if($project['type'] == $key) echo " selected='selected' "; ?>
+                            ><?=$this->__($this->escape($type))?></option>
+                        <?php } ?>
+                    </select>
+                    <br /><br />
+                <?php } ?>
+
+
                 <h4 class="widgettitle title-light"><span
                         class="fa fa-picture-o"></span><?php echo $this->__('label.project_avatar'); ?></h4>
                 <div class="span12 center">

diff --git a/app/domain/tickets/js/ticketsController.js b/app/domain/tickets/js/ticketsController.js
@@ -1220,7 +1220,6 @@ leantime.ticketsController = (function () {
                     data: statusPostData
 
                 }).done(function(response){
-                    console.log(response);
                     leantime.handleAsyncResponse(response);
                 });
 

diff --git a/app/domain/users/repositories/class.users.php b/app/domain/users/repositories/class.users.php
@@ -649,13 +649,15 @@ public function getProfilePicture($id)
                         ->font(ROOT . '/dist/fonts/roboto/Roboto-Regular.woff2')
                         ->fontSize(0.5)
                         ->size(96)
-                        ->background('#81B1A8')->color("#fff")
-                        ->generate();
+                        ->background('#81B1A8')->color("#fff");
 
-                    $image->save(APP_ROOT."/cache/avatars/".$imagename.".png", 100, "png");
-
-                    return array("filename"=>APP_ROOT."/cache/avatars/".$imagename.".png", "type"=>"generated");
+                    if(is_writable(APP_ROOT."/cache/avatars/")) {
+                        $image->generate()->save(APP_ROOT."/cache/avatars/".$imagename.".png", 100, "png");
+                        return array("filename"=>APP_ROOT."/cache/avatars/".$imagename.".png", "type"=>"generated");
+                    }else{
 
+                        return $image->generateSVG();
+                    }
                 }
 
 

diff --git a/config/appSettings.php b/config/appSettings.php
@@ -11,7 +11,7 @@
     class appSettings
     {
 
-        public $appVersion = "2.3.26";
+        public $appVersion = "2.3.27";
 
         public $dbVersion = "2.1.21";
 

diff --git a/config/configuration.sample.php b/config/configuration.sample.php
@@ -19,7 +19,7 @@ class config
     public $sitename = 'Leantime';                        //Name of your site, can be changed later
     public $language = 'en-US';                           //Default language
     public $logoPath = '/dist/images/logo.svg';                //Default logo path, can be changed later
-    public $printLogoURL = '/dist/images/logo.jpg';            //Default logo URL use for printing (must be jpg or png format)
+    public $printLogoURL = '/dist/images/logo.png';            //Default logo URL use for printing (must be jpg or png format)
     public $appUrl = '';                                  //Base URL, trailing slash not needed
     public $appUrlRoot = '';                              //Base of application withotu trailing slash (used for cookies), e.g, /leantime
     public $defaultTheme = 'default';                     //Default theme

diff --git a/config/sample.env b/config/sample.env
@@ -29,7 +29,7 @@ LEAN_LOG_PATH = ''                                # Default Log Path (including
 
 ## Look & Feel, these settings are available in the UI and can be overwritten there.
 LEAN_LOGO_PATH = '/dist/images/logo.svg'                # Default logo path, can be changed later
-LEAN_PRINT_LOGO_URL = '/images/logo.jpg'           # Default logo URL use for printing (must be jpg or png format)
+LEAN_PRINT_LOGO_URL = '/dist/images/logo.png'           # Default logo URL use for printing (must be jpg or png format)
 LEAN_DEFAULT_THEME = 'default'                     # Default theme
 LEAN_PRIMARY_COLOR = '#1b75bb'                     # Primary Theme color
 LEAN_SECONDARY_COLOR = '#81B1A8'                   # Secondary Theme Color

diff --git a/logs/error.log b/logs/error.log
@@ -0,0 +1,6 @@
+[22-Jul-2023 06:52:58 America/Los_Angeles] cron start
+[22-Jul-2023 06:52:58 America/Los_Angeles] cron end
+[22-Jul-2023 07:02:37 America/Los_Angeles] cron start
+[22-Jul-2023 07:02:37 America/Los_Angeles] cron end
+[22-Jul-2023 07:11:15 America/Los_Angeles] cron start
+[22-Jul-2023 07:11:15 America/Los_Angeles] cron end
diff --git a/makefile b/makefile
@@ -25,6 +25,8 @@ package: build
 	cp ./config/configuration.sample.php $(TARGET_DIR)/config
 	cp ./config/sample.env $(TARGET_DIR)/config
 	mkdir -p $(TARGET_DIR)/logs
+	mkdir -p $(TARGET_DIR)/cache
+	mkdir -p $(TARGET_DIR)/cache/avatars
 	touch $(TARGET_DIR)/logs/.gitkeep
 	cp -R ./public $(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/userfiles

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

diff --git a/public/assets/js/app/app.js b/public/assets/js/app/app.js
@@ -10,6 +10,9 @@ leantime.theme = theme;
 var appURL = jQuery('meta[name=identifier-URL]').attr("content");
 leantime.appUrl = appURL;
 
+var leantimeVersion = jQuery('meta[name=leantime-version]').attr("content");
+leantime.version = leantimeVersion;
+
 //Backwards compatibility for some jQuery libs
 jQuery(function() {
     jQuery.fn.size = function() {
@@ -72,7 +75,6 @@ jQuery(document).ready(function(){
 leantime.handleAsyncResponse = function(response)  {
 
     if(response !== undefined) {
-        console.log(response);
         if(response.result !== undefined && response.result.html !== undefined){
 
             var content = jQuery(response.result.html);

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
@@ -1435,8 +1435,14 @@ jQuery(function($, undefined) {
 
 
                     e.preventDefault();
-                    nm.opener.append("<input type='hidden' name='submitAction' value='"+e.originalEvent.submitter.value+"' />")
+                    console.log(e);
+                    let submitAction = "";
+                    if(e && e.originalEvent &&
+                        e.originalEvent.submitter && e.originalEvent.submitter.value) {
+                        submitAction = e.originalEvent.submitter.value;
+                    }
 
+                    nm.opener.append("<input type='hidden' name='submitAction' value='" + submitAction + "' />")
                     nm.opener.trigger('nyroModal');
                 });
             },

diff --git a/public/assets/js/libs/simpleGantt/frappe-gantt.min.js b/public/assets/js/libs/simpleGantt/frappe-gantt.min.js
diff --git a/public/assets/less/editor.less b/public/assets/less/editor.less
@@ -0,0 +1,8 @@
+
+@import  "~css/components/style.default.css";
+@import  "~css/components/dropdowns.css";
+@import  "~css/libs/bootstrap-grid.min.css";
+@import  "~css/libs/tinymceSkin/oxide/content.css";
+@import "~css/libs/roboto.css";
+@import "~css/components/wysiwyg-overrides.css";
+
diff --git a/webpack.mix.js b/webpack.mix.js
@@ -106,6 +106,7 @@ mix
         "./public/assets/js/libs/uppy/uppy.js",
     ], `public/dist/js/compiled-extended-libs.${version}.min.js`)
     .less('./public/assets/less/main.less', `public/dist/css/main.${version}.min.css`)
+    .less('./public/assets/less/editor.less', `public/dist/css/editor.${version}.min.css`)
     .copy('./public/assets/images', 'public/dist/images')
     .copy('./public/assets/fonts', 'public/dist/fonts')
     .eslint({