Commit 58dd02ec authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:ambulance: fix(core) Fix cancel button on template dialog

issue #5797
Showing with 9 additions and 8 deletions
+9 -8
...@@ -48,14 +48,15 @@ class templateDialog ...@@ -48,14 +48,15 @@ class templateDialog
function save_object () function save_object ()
{ {
if ($this->target === NULL) { if (isset($_POST[$this->post_cancel])) {
if (isset($_POST[$this->post_cancel])) { return $this->handle_cancel();
return $this->handle_cancel(); }
}
if ((isset($_POST[$this->post_finish]) || isset($_GET[$this->post_finish])) && is_object($this->template)) { if (($this->target === NULL) &&
$this->template->save_object(); (isset($_POST[$this->post_finish]) || isset($_GET[$this->post_finish])) &&
return $this->handle_finish(); is_object($this->template)) {
} $this->template->save_object();
return $this->handle_finish();
} }
if ( if (
......
  • bmortier @bmortier

    mentioned in commit fab29602

    By Côme Chilliet on 2018-10-02T13:39:35 (imported from GitLab)

    ·

    mentioned in commit fab29602

    By Côme Chilliet on 2018-10-02T13:39:35 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in merge request !413

    By Côme Chilliet on 2018-10-02T13:40:03 (imported from GitLab)

    ·

    mentioned in merge request !413

    By Côme Chilliet on 2018-10-02T13:40:03 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in commit d23b44fc

    By Côme Chilliet on 2018-10-02T13:40:35 (imported from GitLab)

    ·

    mentioned in commit d23b44fc

    By Côme Chilliet on 2018-10-02T13:40:35 (imported from GitLab)

    Toggle commit list
  • bmortier @bmortier

    mentioned in merge request !414

    By Côme Chilliet on 2018-10-02T13:41:35 (imported from GitLab)

    ·

    mentioned in merge request !414

    By Côme Chilliet on 2018-10-02T13:41:35 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment