diff options
Diffstat (limited to 'app/model')
| -rw-r--r-- | app/model/datamods.php | 2 | ||||
| -rw-r--r-- | app/model/issue.php | 10 | ||||
| -rw-r--r-- | app/model/pad.php | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/app/model/datamods.php b/app/model/datamods.php index 0b7f3da..b3384a7 100644 --- a/app/model/datamods.php +++ b/app/model/datamods.php @@ -114,7 +114,7 @@ if (isAction("dm-issue-add")) $issue = issue::initNew($mesg, $user, $stages[0]); $log = mesg::initNewLog("%s opened issue", $user, $issue); - location(); // bug mitigation + setAutoModal("#issueModal-" . $issue->guid); } ?> diff --git a/app/model/issue.php b/app/model/issue.php index dd904e4..41392e8 100644 --- a/app/model/issue.php +++ b/app/model/issue.php @@ -25,6 +25,7 @@ if (isAction("iss-mesg-add")) $form->text("issue"); $form->text("mesg", false); $form->text("assignee"); + $form->flag("nopop"); if (!$form->populate(input())) return; @@ -48,7 +49,9 @@ if (isAction("iss-mesg-add")) $mesg = mesg::initNew($form->mesg, $user, $issue); if ($mesg->setAttachment("attachment")) - logError(NOTICE, "Saved attachment " . $mesg->attachment); + { + //logError(NOTICE, "Saved attachment " . $mesg->attachment); + } } if (isset(input()['advIssue'])) @@ -69,7 +72,6 @@ if (isAction("iss-mesg-add")) else { $issue->signoffAssignee($user); - logError(NOTICE, "Issue #" . $issue->numb . " closed"); $log = mesg::initNewLog("%s closed issue", $user, $issue); } } @@ -101,12 +103,12 @@ if (isAction("iss-mesg-add")) $issue->signoffAssignee($user); $issue->close($user); - logError(NOTICE, "Issue #" . $issue->numb . " closed"); $log = mesg::initNewLog("%s closed issue", $user, $issue); } /* automatically redisplay issue modal */ - setAutoModal("#issueModal-" . $issue->guid); + if ($form->nopop != "1") + setAutoModal("#issueModal-" . $issue->guid); } ?> diff --git a/app/model/pad.php b/app/model/pad.php index e11a644..69f58e2 100644 --- a/app/model/pad.php +++ b/app/model/pad.php @@ -41,6 +41,11 @@ foreach ($stages as $s) $issues = array_merge($issues, $i); } +/* this will include a 'just closed' issue on the main pad page, enabling it + * to be displayed via auto-modal */ +if (isset($_REQUEST['input']['issue'])) + $issues[] = new issue($_REQUEST['input']['issue']); + $closed_issues = $pad->getClosedIssues_ordByClosed(); ?> |