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

a few more mp2 bugfixes

Browse source
This commit is contained in:
JT Smith 2005-11-04 15:04:52 +00:00
parent bf9776d43e
commit fe549ee746
5 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -52,7 +52,7 @@ sub _createField {
if (isIn($data->{type},qw(selectList checkList))) { if (isIn($data->{type},qw(selectList checkList))) {
my @defaultValues; my @defaultValues;
if ($session{form}{$param{name}}) { if ($session{form}{$param{name}}) {
@defaultValues = $session{req}->param($param{name}); @defaultValues = WebGUI::FormProcessor::selectList($param{name});
} else { } else {
foreach (split(/\n/, $data->{value})) { foreach (split(/\n/, $data->{value})) {
s/\s+$//; # remove trailing spaces s/\s+$//; # remove trailing spaces

8
lib/WebGUI/Operation/Group.pm
View file

@ -158,7 +158,7 @@ sub walkGroups {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_addGroupsToGroupSave { sub www_addGroupsToGroupSave {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid}));
my @groups = $session{req}->param('groups'); my @groups = WebGUI::FormProcessor::group('groups');
WebGUI::Grouping::addGroupsToGroups(\@groups,[$session{form}{gid}]); WebGUI::Grouping::addGroupsToGroups(\@groups,[$session{form}{gid}]);
return www_manageGroupsInGroup(); return www_manageGroupsInGroup();
} }
@ -166,7 +166,7 @@ sub www_addGroupsToGroupSave {
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub www_addUsersToGroupSave { sub www_addUsersToGroupSave {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid})); return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || _hasSecondaryPrivilege($session{form}{gid}));
my @users = $session{req}->param('users'); my @users = WebGUI::FormProcessor::selectList('users');
WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]); WebGUI::Grouping::addUsersToGroups(\@users,[$session{form}{gid}]);
return www_manageUsersInGroup(); return www_manageUsersInGroup();
} }
@ -226,8 +226,8 @@ sub www_deleteGrouping {
if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') { if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') {
return WebGUI::Privilege::vitalComponent(); return WebGUI::Privilege::vitalComponent();
} }
my @users = $session{req}->param('uid'); my @users = WebGUI::FormProcessor::selectList('uid');
my @groups = $session{req}->param("gid"); my @groups = WebGUI::FormProcessor::group("gid");
foreach my $user (@users) { foreach my $user (@users) {
my $u = WebGUI::User->new($user); my $u = WebGUI::User->new($user);
$u->deleteFromGroups(\@groups); $u->deleteFromGroups(\@groups);

3
lib/WebGUI/Operation/ProductManager.pm
View file

@ -5,6 +5,7 @@ use WebGUI::Session;
use WebGUI::SQL; use WebGUI::SQL;
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
use WebGUI::Form; use WebGUI::Form;
use WebGUI::FormProcessor;
use WebGUI::Id; use WebGUI::Id;
use WebGUI::International; use WebGUI::International;
use WebGUI::AdminConsole; use WebGUI::AdminConsole;
@ -560,7 +561,7 @@ sub www_listProductVariantsSave {
return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14)); return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(14));
my %availableVariants = map {$_ => 1} $session{req}->param('available'); my %availableVariants = map {$_ => 1} WebGUI::FormProcessor::selectList('available');
my $product = WebGUI::Product->new($session{form}{productId}); my $product = WebGUI::Product->new($session{form}{productId});
my @variants = @{$product->getVariant}; my @variants = @{$product->getVariant};

5
lib/WebGUI/Operation/Subscription.pm
View file

@ -86,6 +86,7 @@ sub www_createSubscriptionCodeBatch {
-hoverHelp => $i18n->get('codes expire description'), -hoverHelp => $i18n->get('codes expire description'),
-value => $session{form}{expires} || WebGUI::DateTime::intervalToSeconds(1, 'months') -value => $session{form}{expires} || WebGUI::DateTime::intervalToSeconds(1, 'months')
); );
my @sub = WebGUI::FormProcessor::selectList("subscriptionId");
$f->selectList( $f->selectList(
-name => 'subscriptionId', -name => 'subscriptionId',
-label => $i18n->get('association'), -label => $i18n->get('association'),
@ -93,7 +94,7 @@ sub www_createSubscriptionCodeBatch {
-options=> \%subscriptions, -options=> \%subscriptions,
-multiple=>1, -multiple=>1,
-size => 5, -size => 5,
-value => [ ($session{req}->param('subscriptionId'))] -value => \@sub
); );
$f->textarea( $f->textarea(
-name => 'description', -name => 'description',
@ -136,7 +137,7 @@ sub www_createSubscriptionCodeBatchSave {
WebGUI::SQL->write("insert into subscriptionCode (batchId, code, status, dateCreated, dateUsed, expires, usedBy)". WebGUI::SQL->write("insert into subscriptionCode (batchId, code, status, dateCreated, dateUsed, expires, usedBy)".
" values (".quote($batchId).",".quote($code).", 'Unused', ".quote($creationEpoch).", 0, ".quote($expires).", 0)"); " values (".quote($batchId).",".quote($code).", 'Unused', ".quote($creationEpoch).", 0, ".quote($expires).", 0)");
@subscriptions = $session{req}->param('subscriptionId'); @subscriptions = WebGUI::FormProcessor::selectList('subscriptionId');
foreach (@subscriptions) { foreach (@subscriptions) {
WebGUI::SQL->write("insert into subscriptionCodeSubscriptions (code, subscriptionId) values (". WebGUI::SQL->write("insert into subscriptionCodeSubscriptions (code, subscriptionId) values (".
quote($code).", ".quote($_).")"); quote($code).", ".quote($_).")");

14
lib/WebGUI/Operation/User.pm
View file

@ -15,10 +15,10 @@ use Tie::CPHash;
use Tie::IxHash; use Tie::IxHash;
use WebGUI::AdminConsole; use WebGUI::AdminConsole;
use WebGUI::DateTime; use WebGUI::DateTime;
use WebGUI::Form;
use WebGUI::FormProcessor; use WebGUI::FormProcessor;
use WebGUI::Group; use WebGUI::Group;
use WebGUI::Grouping; use WebGUI::Grouping;
use WebGUI::Form;
use WebGUI::HTMLForm; use WebGUI::HTMLForm;
use WebGUI::Icon; use WebGUI::Icon;
use WebGUI::International; use WebGUI::International;
@ -169,8 +169,8 @@ sub www_deleteGrouping {
if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') { if (($session{user}{userId} eq $session{form}{uid} || $session{form}{uid} eq '3') && $session{form}{gid} eq '3') {
return _submenu(WebGUI::Privilege::vitalComponent()); return _submenu(WebGUI::Privilege::vitalComponent());
} }
my @users = $session{req}->param('uid'); my @users = WebGUI::FormProcessor::selectList('uid');
my @groups = $session{req}->param("gid"); my @groups = WebGUI::FormProcessor::group("gid");
foreach my $user (@users) { foreach my $user (@users) {
my $u = WebGUI::User->new($user); my $u = WebGUI::User->new($user);
$u->deleteFromGroups(\@groups); $u->deleteFromGroups(\@groups);
@ -323,7 +323,7 @@ sub www_editUser {
$previousCategory = $category; $previousCategory = $category;
} }
$a->finish; $a->finish;
my @groupsToAdd = $session{req}->param("groupsToAdd"); my @groupsToAdd = WebGUI::FormProcessor::group("groupsToAdd");
my @exclude = WebGUI::SQL->buildArray("select groupId from groupings where userId=".quote($u->userId)); my @exclude = WebGUI::SQL->buildArray("select groupId from groupings where userId=".quote($u->userId));
@exclude = (@exclude,"1","2","7"); @exclude = (@exclude,"1","2","7");
$tabform->getTab("groups")->group( $tabform->getTab("groups")->group(
@ -345,7 +345,7 @@ sub www_editUser {
} }
} }
push (@include, "0"); push (@include, "0");
my @groupsToDelete = $session{req}->param("groupsToDelete"); my @groupsToDelete = WebGUI::FormProcessor::group("groupsToDelete");
$tabform->getTab("groups")->selectList( $tabform->getTab("groups")->selectList(
-name=>"groupsToDelete", -name=>"groupsToDelete",
-options=>WebGUI::SQL->buildHashRef("select groupId, groupName from groups -options=>WebGUI::SQL->buildHashRef("select groupId, groupName from groups
@ -385,9 +385,9 @@ sub www_editUserSave {
$u->profileField($field{fieldName},WebGUI::FormProcessor::process($field{fieldName},$field{dataType})); $u->profileField($field{fieldName},WebGUI::FormProcessor::process($field{fieldName},$field{dataType}));
} }
$a->finish; $a->finish;
my @groups = $session{req}->param("groupsToAdd"); my @groups = WebGUI::FormProcessor::group("groupsToAdd");
$u->addToGroups(\@groups); $u->addToGroups(\@groups);
@groups = $session{req}->param("groupsToDelete"); @groups = WebGUI::FormProcessor::group("groupsToDelete");
$u->deleteFromGroups(\@groups); $u->deleteFromGroups(\@groups);
} else { } else {
$error = '<ul><li>'.WebGUI::International::get(77).' '.$session{form}{username}.'Too or '.$session{form}{username}.'02</li></ul>'; $error = '<ul><li>'.WebGUI::International::get(77).' '.$session{form}{username}.'Too or '.$session{form}{username}.'02</li></ul>';