From dee987b263b021b990ea4c62cb15be47c6d61fb5 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 05 Jan 2015 08:30:12 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/web/client/client_template_del.php | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/interface/web/client/client_template_del.php b/interface/web/client/client_template_del.php
index 1dcdbac..b57224f 100644
--- a/interface/web/client/client_template_del.php
+++ b/interface/web/client/client_template_del.php
@@ -1,6 +1,6 @@
<?php
/*
-Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
+Copyright (c) 2007-2010, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
@@ -39,8 +39,8 @@
* End Form configuration
******************************************/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
//* Check permissions for module
$app->auth->check_module_permissions('client');
@@ -52,16 +52,24 @@
class page_action extends tform_actions {
function onBeforeDelete() {
global $app;
-
+
+ // check new style
+ $rec = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client_template_assigned WHERE client_template_id = ".$this->id);
+ if($rec['number'] > 0) {
+ $app->error($app->tform->lng('template_del_aborted_txt'));
+ }
+
+ // check old style
$rec = $app->db->queryOneRecord("SELECT count(client_id) as number FROM client WHERE template_master = ".$this->id." OR template_additional like '%/".$this->id."/%'");
if($rec['number'] > 0) {
$app->error($app->tform->lng('template_del_aborted_txt'));
}
-
+
}
+
}
$page = new page_action;
$page->onDelete()
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1