prepare release 1.6 (#1270)

SECURITY.md

@@ -7,8 +7,8 @@ As announced in the [README](README.md) I only support the latest available rele
 | Version | Supported          |
 | ------- | ------------------ |
 | master  | :white_check_mark: |
-| 1.5     | :white_check_mark: |
+| 1.6     | :white_check_mark: |
-| < 1.5   | :x:                |
+| < 1.6   | :x:                |
 
 ## Reporting a Vulnerability
 

assets/js/plugins/KimaiSelectDataAPI.js

@@ -60,9 +60,9 @@ export default class KimaiSelectDataAPI extends KimaiPlugin {
     _updateSelect(selectName, data) {
         const options = {};
         for (const apiData of data) {
-            let title = apiData.parentTitle;
+            let title = '__empty__';
-            if (title === null) {
+            if (apiData.hasOwnProperty('parentTitle')) {
-                title = '__empty__';
+                title = apiData.parentTitle;
             }
             if (!options.hasOwnProperty(title)) {
                 options[title] = [];

composer.json

@@ -127,9 +127,15 @@
         "kimai:code-check":  [
             "@kimai:codestyle",
             "@kimai:phpstan",
+            "@kimai:code-lint",
             "@kimai:tests-unit",
             "@kimai:tests-integration"
         ],
+        "kimai:code-lint":  [
+            "bin/console lint:yaml config --parse-tags",
+            "bin/console lint:twig templates",
+            "bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction"
+        ],
         "kimai:tests": "vendor/bin/phpunit tests/",
         "kimai:tests-unit": "vendor/bin/phpunit --exclude-group integration tests/",
         "kimai:tests-integration": "vendor/bin/phpunit --group integration tests/",

public/build/entrypoints.json

@@ -5,7 +5,7 @@
         "build/runtime.4ee6be68.js",
         "build/0.a87622f3.js",
         "build/1.c1bee41f.js",
-        "build/app.654b112a.js"
+        "build/app.9b7fe418.js"
       ],
       "css": [
         "build/app.e5eb271e.css"
@@ -35,7 +35,7 @@
     "build/runtime.4ee6be68.js": "sha384-xNNrNinl64G3nCUrIskgSjU0mUXXCB9lj6XCSInBTwxSKXk8uTMafnLHtdWdIGtd",
     "build/0.a87622f3.js": "sha384-ncT/BKhCsqH6jhxwdsSG95m1ei7ZZjeZtzH1262h+OPUU80TSFFE3dt+abcHHMok",
     "build/1.c1bee41f.js": "sha384-7UVWcP6Hefp2k/CrtGSITKXx4dSZqtvpAiU8WX7dClETkzMewrUjoCRtVXQ5j3KI",
-    "build/app.654b112a.js": "sha384-N3FPEZ2My08r2UzBARsUYukgMM5L+vGKHHDiUG5XPwTmiKFZh7PE+ldwk3C4g7Zn",
+    "build/app.9b7fe418.js": "sha384-aZ9rWWTdD8Wle65UC/WJd7Q/vX7iQSwMK/hhWvQmb6FvDz6MyRI+20b3+OAPybJL",
     "build/app.e5eb271e.css": "sha384-BNUNuu56X2x+Xmn1JrQe6d3mt6R+QZu7OgR/4OXkBDueSE6vu0UqmRaDPkyiRzMw",
     "build/2.7be60d8d.js": "sha384-txR0QG+838LKYtPQ99Gx4OU7WmgN9J3joZEyGwIskSz74EN1T4/IBVnmNaKiFN1q",
     "build/chart.0af3f813.js": "sha384-I57c9DtU3AOG2kzKqIZkIu0hi1aGYHRZ5QG4LKC9+9slzJnAMttPGXoL2cQG3m6y",

public/build/manifest.json

@@ -3,7 +3,7 @@
   "build/1.c1bee41f.js": "build/1.c1bee41f.js",
   "build/2.7be60d8d.js": "build/2.7be60d8d.js",
   "build/app.css": "build/app.e5eb271e.css",
-  "build/app.js": "build/app.654b112a.js",
+  "build/app.js": "build/app.9b7fe418.js",
   "build/calendar.css": "build/calendar.36ef2a02.css",
   "build/calendar.js": "build/calendar.082ddfbb.js",
   "build/chart.js": "build/chart.0af3f813.js",

src/Constants.php

@@ -21,7 +21,7 @@ class Constants
     /**
      * The current release status, either "stable" or "dev"
      */
-    public const STATUS = 'dev';
+    public const STATUS = 'stable';
     /**
      * The software name
      */

src/Entity/MetaTableTypeTrait.php

@@ -116,6 +116,16 @@ trait MetaTableTypeTrait
      */
     public function setValue($value): MetaTableTypeInterface
     {
+        // unchecked checkboxes / false bool would save an empty string in the database
+        // those cannot be searched in the database
+        if (null !== $value) {
+            switch ($this->type) {
+                case YesNoType::class:
+                case CheckboxType::class:
+                    $value = (int) $value;
+            }
+        }
+
         $this->value = $value;
 
         return $this;

templates/about/layout.html.twig

@@ -42,7 +42,7 @@
                         </li>
                         <li>
                             <a href="{{ constant('App\\Constants::HOMEPAGE') }}/donate/" target="_blank">
-                                <i class="menu-icon fab fa-paypal bg-blue"></i>
+                                <i class="menu-icon fas fa-hand-holding-heart bg-blue"></i>
                                 {{ 'donate'|trans({}, 'about') }}
                             </a>
                         </li>

templates/activity/edit.html.twig

@@ -35,6 +35,7 @@
                         {{ form_row(form.hourlyRate) }}
                     </div>
                 </div>
+                {% if form.budget is defined %}
                 <div class="row">
                     <div class="col-md-6">
                         {{ form_row(form.budget) }}
@@ -43,6 +44,7 @@
                         {{ form_row(form.timeBudget) }}
                     </div>
                 </div>
+                {% endif %}
             </fieldset>
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}

templates/calendar/user.html.twig

@@ -116,7 +116,7 @@
                 weekNumbers: {% if config.showWeekNumbers %}true{% else %}false{% endif %},
                 allDaySlot: false,
                 navLinks: true,
-                locale: '{{ app.request.locale }}',
+                locale: '{{ app.request.locale|replace({'_': '-'})|lower }}',
                 /*
                 // TODO calculate height properly instead of relying on the default aspectRatio
                 height: function() {

templates/customer/edit.html.twig

@@ -81,6 +81,7 @@
                         {{ form_row(form.hourlyRate) }}
                     </div>
                 </div>
+                {% if form.budget is defined %}
                 <div class="row">
                     <div class="col-md-6">
                         {{ form_row(form.budget) }}
@@ -89,6 +90,7 @@
                         {{ form_row(form.timeBudget) }}
                     </div>
                 </div>
+                {% endif %}
             </fieldset>
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}

templates/project/edit.html.twig

@@ -42,6 +42,7 @@
                         {{ form_row(form.hourlyRate) }}
                     </div>
                 </div>
+                {% if form.budget is defined %}
                 <div class="row">
                     <div class="col-md-6">
                         {{ form_row(form.budget) }}
@@ -50,6 +51,7 @@
                         {{ form_row(form.timeBudget) }}
                     </div>
                 </div>
+                {% endif %}
             </fieldset>
             {{ form_row(form.visible) }}
             {% if form.metaFields is defined and form.metaFields is not empty %}

translations/plugins.ja.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="ja" target-language="en" datatype="plaintext" original="none">
+    <file source-language="en" target-language="ja" datatype="plaintext" original="none">
         <body>
             <trans-unit id="plugins.title">
                 <source>plugins.title</source>

translations/system-configuration.es.xliff

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" target-language="en" datatype="plaintext" original="system-configuration.en.xliff">
+    <file source-language="en" target-language="es" datatype="plaintext" original="system-configuration.en.xliff">
         <body>
             <trans-unit id="title">
                 <source>title</source>