From cb14b59191a9562901440115eed62ec1f1e9e701 Mon Sep 17 00:00:00 2001 From: LouisGac Date: Wed, 18 Oct 2017 15:06:34 +0200 Subject: [PATCH] Dev: updated delete template function --- application/controllers/admin/templates.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/application/controllers/admin/templates.php b/application/controllers/admin/templates.php index cf10561df7d..a73461f0042 100644 --- a/application/controllers/admin/templates.php +++ b/application/controllers/admin/templates.php @@ -516,7 +516,7 @@ public function delete($templatename) Yii::app()->loadHelper("admin/template"); - if (array_key_exists($templatename,Template::getTemplateList()) && !Template::isStandardTemplate($templatename)){ + if ( Template::checkIfTemplateExists($templatename) && !Template::isStandardTemplate($templatename)){ if (rmdirr(Yii::app()->getConfig('usertemplaterootdir') . "/" . $templatename) == true) { $surveys = Survey::model()->findAllByAttributes(array('template' => $templatename)); @@ -533,7 +533,7 @@ public function delete($templatename) $s->save(); } - Template::model()->deleteAllByAttributes(array('folder' => $templatename)); + TemplateConfiguration::uninstall($templatename); Permission::model()->deleteAllByAttributes(array('permission' => $templatename,'entity' => 'template')); Yii::app()->setFlashMessage(sprintf(gT("Template '%s' was successfully deleted."), $templatename)); @@ -544,9 +544,9 @@ public function delete($templatename) }else{ // Throw an error 500 ? } - + // Redirect with default templatename, editfile and screenname - $this->getController()->redirect(array("admin/templates/sa/view")); + $this->getController()->redirect(array("admin/templateoptions")); } /**