From d8f796fe913f4723f5af06a2e3058d3f494ce58f Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 20 Nov 2003 02:58:26 +0000
Subject: [PATCH] fixed bug [ 844961 ] DataForm: no deleting

---
 docs/changelog/5.x.x.txt       |  1 +
 lib/WebGUI/Wobject/DataForm.pm | 26 +++++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/docs/changelog/5.x.x.txt b/docs/changelog/5.x.x.txt
index 9917cfdff..e4b2582f5 100644
--- a/docs/changelog/5.x.x.txt
+++ b/docs/changelog/5.x.x.txt
@@ -10,6 +10,7 @@
  - Fixed bug [ 844196 ] Time formats
  - Fixed a bug in the forum where new replies defaulted to always subscribing
    the user to the thread.
+ - Fixed bug [ 844961 ] DataForm: no deleting
  - Bugfix [ 822324 ]: From field not working in DataForm when mailing to group
  - Fixed typos in importCollateral.pl
 
diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm
index 41632cfd6..13ed0dec5 100644
--- a/lib/WebGUI/Wobject/DataForm.pm
+++ b/lib/WebGUI/Wobject/DataForm.pm
@@ -166,8 +166,8 @@ sub getRecordTemplateVars {
 	$var->{"entryList.label"} = WebGUI::International::get(86,$self->get("namespace"));
 	$var->{"export.tab.url"} = WebGUI::URL::page('func=exportTab&wid='.$self->get("wobjectId"));
 	$var->{"export.tab.label"} = WebGUI::International::get(84,$self->get("namespace"));
-+	$var->{"delete.url"} = WebGUI::URL::page('func=delete&wid='.$self->get("wobjectId").'&entryId='.$var->{entryId});
-+	$var->{"delete.label"} = WebGUI::International::get(90,$self->get("namespace"));
+	$var->{"delete.url"} = WebGUI::URL::page('func=deleteEntry&wid='.$self->get("wobjectId").'&entryId='.$var->{entryId});
+	$var->{"delete.label"} = WebGUI::International::get(90,$self->get("namespace"));
 	$var->{"back.url"} = WebGUI::URL::page();
 	$var->{"back.label"} = WebGUI::International::get(18,$self->get("namespace"));
 	$var->{"addField.url"} = WebGUI::URL::page('func=editField&wid='.$self->get("wobjectId"));
@@ -315,6 +315,15 @@ sub uiLevel {
         return 5;
 }
 
+#-------------------------------------------------------------------
+sub www_deleteEntry {
+        return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
+        my $entryId = $session{form}{entryId};
+    	WebGUI::SQL->write("delete from DataForm_entry where DataForm_entryId=".$entryId);
+        $session{form}{entryId} = 'list';
+        return $_[0]->www_view();
+}
+
 #-------------------------------------------------------------------
 sub www_deleteField {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId")));
@@ -654,19 +663,6 @@ sub www_view {
 	return $_[0]->processTemplate($_[0]->get("templateId"),$var);
 }
 
-#-------------------------------------------------------------------
-sub www_delete {
-        my $entryId = $session{form}{entryId};
-        if (!WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId"))) {
-                return WebGUI::Privilege::insufficient();
-        }
-        
-    	WebGUI::SQL->write("delete from DataForm_entry where DataForm_entryId=".$entryId);
-        
-        $session{form}{entryId} = 'list';
-        return $_[0]->www_view();
-}
-
 
 1;