From 4c40c8acb2de8f1f0f7408524cccec0234024ab7 Mon Sep 17 00:00:00 2001 From: dpage Date: Wed, 12 Dec 2007 21:12:14 +0000 Subject: [PATCH] Don't offer 'Drop Cascaded' unless the user can 'Drop' the object. git-svn-id: svn://svn.pgadmin.org/trunk/pgadmin3@6892 a7884b65-44f6-0310-8a51-81a127f17b15 --- CHANGELOG | 2 ++ pgadmin/dlg/dlgProperty.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 30c2daf78..7525a18b5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,8 @@ Changes Date Dev Ver Change details ---------- --- ----- -------------- +2007-12-12 DP 1.8.1 Don't offer 'Drop Cascaded' unless the user can 'Drop' + the object. 2007-12-12 DP 1.8.1 Prevent non-superusers from attempting to use the debugger because the plugin API won't let them anyway. 2007-12-11 DP 1.8.1 Check that functions exist before debugging or setting diff --git a/pgadmin/dlg/dlgProperty.cpp b/pgadmin/dlg/dlgProperty.cpp index 9d3d8c21a..2bf35dbab 100644 --- a/pgadmin/dlg/dlgProperty.cpp +++ b/pgadmin/dlg/dlgProperty.cpp @@ -1650,7 +1650,7 @@ wxWindow *dropCascadedFactory::StartDialog(frmMain *form, pgObject *obj) bool dropCascadedFactory::CheckEnable(pgObject *obj) { - return obj && obj->CanDropCascaded(); + return obj && obj->CanDrop() && obj->CanDropCascaded(); } -- 2.39.5