oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed bug [ 844961 ] DataForm: no deleting

Browse source
This commit is contained in:
JT Smith 2003-11-20 02:58:26 +00:00
parent af8adc55e7
commit d8f796fe91
2 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/5.x.x.txt
View file

@ -10,6 +10,7 @@
- Fixed bug [ 844196 ] Time formats - Fixed bug [ 844196 ] Time formats
- Fixed a bug in the forum where new replies defaulted to always subscribing - Fixed a bug in the forum where new replies defaulted to always subscribing
the user to the thread. the user to the thread.
- Fixed bug [ 844961 ] DataForm: no deleting
- Bugfix [ 822324 ]: From field not working in DataForm when mailing to group - Bugfix [ 822324 ]: From field not working in DataForm when mailing to group
- Fixed typos in importCollateral.pl - Fixed typos in importCollateral.pl

26
lib/WebGUI/Wobject/DataForm.pm
View file

@ -166,8 +166,8 @@ sub getRecordTemplateVars {
$var->{"entryList.label"} = WebGUI::International::get(86,$self->get("namespace")); $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.url"} = WebGUI::URL::page('func=exportTab&wid='.$self->get("wobjectId"));
$var->{"export.tab.label"} = WebGUI::International::get(84,$self->get("namespace")); $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.url"} = WebGUI::URL::page('func=deleteEntry&wid='.$self->get("wobjectId").'&entryId='.$var->{entryId});
+ $var->{"delete.label"} = WebGUI::International::get(90,$self->get("namespace")); $var->{"delete.label"} = WebGUI::International::get(90,$self->get("namespace"));
$var->{"back.url"} = WebGUI::URL::page(); $var->{"back.url"} = WebGUI::URL::page();
$var->{"back.label"} = WebGUI::International::get(18,$self->get("namespace")); $var->{"back.label"} = WebGUI::International::get(18,$self->get("namespace"));
$var->{"addField.url"} = WebGUI::URL::page('func=editField&wid='.$self->get("wobjectId")); $var->{"addField.url"} = WebGUI::URL::page('func=editField&wid='.$self->get("wobjectId"));
@ -315,6 +315,15 @@ sub uiLevel {
return 5; 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 { sub www_deleteField {
return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditWobject($_[0]->get("wobjectId"))); 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); 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; 1;