WiP

Author: mmikel

client/js/form.js

@@ -1086,6 +1086,7 @@ function cardForm(params) {
     }
 
     function ok() {
+        $("#modal").off("hidden.bs.modal");
         $(".modalFormField").removeClass("is-invalid");
         $(".select2-invalid").removeClass("select2-invalid");
         $(".border-color-invalid").removeClass("border-color-invalid");
@@ -1162,6 +1163,7 @@ function cardForm(params) {
     }
 
     function del() {
+        $("#modal").off("hidden.bs.modal");
         if (typeof params.callback === "function") {
             let result = {};
 
@@ -1180,12 +1182,13 @@ function cardForm(params) {
     }
 
     function cancel() {
-        if (!params.target) {
-            $('#modal').modal('hide');
-        }
+        $("#modal").off("hidden.bs.modal");
         if (typeof params.cancel === "function") {
             params.cancel();
         }
+        if (!params.target) {
+            $('#modal').modal('hide');
+        }
     }
 
     let target;
@@ -1253,6 +1256,8 @@ function cardForm(params) {
     $(".modalFormDelete").off("click").on("click", del);
     $(".modalFormCancel").off("click").on("click", cancel);
 
+    $("#modal").off("hidden.bs.modal").on("hidden.bs.modal", cancel);
+
     $(".cardFormSelectWithRotate").off("click").on("click", function () {
         let select = $("#" + $(this).attr("data-for"));
         let i = parseInt(select.attr("data-field-index"));

client/js/utils.js

@@ -438,7 +438,7 @@ function navigateUrl(route, params, options) {
         loadingStart();
         window.location.href = "?#" + route + "&" + $.param(params);
     } else {
-        return "?#" + route + "&" + $.param(params);
+        return "?#" + route + ((params && Object.keys(params).length) ? ("&" + $.param(params)) : "");
     }
 }
 

client/modules/tt/createIssue.js

@@ -1,9 +1,8 @@
 ({
     init: function () {
         if (AVAIL("tt", "issue", "POST") && modules.tt.menuItem) {
-            $("#" + leftSideClick("far fa-fw fa-plus-square", i18n("tt.createIssue"), "tt", () => {
-                modules.tt.createIssue.createIssue($("#ttProjectSelect").val());
-            })).after($("#" + modules.tt.menuItem));
+            $("#" + leftSide("far fa-fw fa-plus-square", i18n("tt.createIssue"), navigateUrl("tt.createIssue", false, { exclude: [ "_" ]}), "tt")).
+            after($("#" + modules.tt.menuItem));
         }
         moduleLoaded("tt.createIssue", this);
     },
@@ -194,6 +193,9 @@
                 navigateUrl("tt.createIssue", { project: result.project, workflow: result.workflow, catalog: result.catalog, parent: !!parent ? parent["issueId"] : false }, { run: true });
                 // modules.tt.createIssueForm(result.project, result.workflow, result.catalog, (!!parent) ? encodeURIComponent(parent["issueId"]) : "");
             },
+            cancel: () => {
+                window.history.back();
+            }
         });
     },
 
@@ -360,7 +362,12 @@
         GET("tt", "tt", false, true).
         done(modules.tt.tt).
         done(() => {
-            modules.tt.createIssue.createIssueForm(params.project, params.workflow, params.catalog, params.parent);
+            if (params.project && params.workflow) {
+                modules.tt.createIssue.createIssueForm(params.project, params.workflow, params.catalog, params.parent);
+            } else {
+                loadingDone();
+                modules.tt.createIssue.createIssue($("#ttProjectSelect").val() ? $("#ttProjectSelect").val() : lStore("ttProject"));
+            }
         }).
         fail(FAIL).
         fail(loadingDone);

client/modules/tt/issue.js

@@ -1475,6 +1475,7 @@
 
         GET("tt", "issue", params["issue"], true).
         done(r => {
+            $("#altForm").hide();
             if (modules.groups) {
                 modules.users.loadUsers(() => {
                     modules.groups.loadGroups(() => {