Merge branch '5797-cancel-button-has-no-effect-apply-template' into '1.4-dev'

Resolve "cancel button has no effect (apply template)"

See merge request fusiondirectory/fd!455

(cherry picked from commit 89a1cbff)

41bea421  fix(templateDialog) Remove lock on objects when canceling

include/simpleplugin/class_simpleManagement.inc

@@ -118,6 +118,7 @@ class templateDialog
 
   function handle_cancel ()
   {
+    $this->simpleManagement->remove_lock();
     $this->simpleManagement->closeDialogs();
     return FALSE;
   }