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

fix [ 1488663 ] Add new subscription broken

Browse source
This commit is contained in:
Martin Kamerbeek 2006-05-16 15:08:23 +00:00
parent f4be5edbf6
commit 0782b8853a
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@
- Fixed a problem where anybody could see the complete list of admin console
functions in the adminbar, even though they couldn't actually use them.
- fix [ 1489094 ] DataForm Record edit link wrong for list mode (Michelle LaMar)
- fix [ 1488663 ] Add new subscription broken (Martin Kamerbeek / Procolix)
6.99.0
- Added a workflow system.

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

@ -355,7 +355,7 @@ sub www_editSubscription {
-label => $i18n->get('subscription duration'),
-hoverHelp => $i18n->get('subscription duration description'),
-value => [$properties->{duration} || 'Monthly'],
-options=> WebGUI::Commerce::Payment->recurringPeriodValues($session),
-options=> WebGUI::Commerce::Payment::recurringPeriodValues($session),
);
$f->text(
-name => 'executeOnSubscription',
@ -393,8 +393,13 @@ sub www_editSubscriptionSave {
my (@relevantFields);
return $session->privilege->adminOnly() unless ($session->user->isInGroup(3));
my $properties = {};
@relevantFields = qw(subscriptionId name price description subscriptionGroup duration executeOnSubscription karma);
WebGUI::Subscription->new($session,$session->form->process("sid"))->set({map {$_ => $session->form->process($_)} @relevantFields});
foreach (@relevantFields) {
$properties->{$_} = $session->form->process($_) if (defined $session->form->process($_));
}
WebGUI::Subscription->new($session,$session->form->process("sid"))->set($properties);
return www_listSubscriptions($session);
}

4
lib/WebGUI/Subscription.pm
View file

@ -167,7 +167,7 @@ been set.
=head3 Valid Object properties
name price description subscriptionGroup duration executeOnSubscribe karma
name price description subscriptionGroup duration executeOnSubscription karma
=cut
@ -177,7 +177,7 @@ sub set {
$properties = shift;
foreach (keys(%{$properties})) {
if (isIn($_, qw(name price description subscriptionGroup duration executeOnSubscribe karma))) {
if (isIn($_, qw(name price description subscriptionGroup duration executeOnSubscription karma))) {
$self->{_properties}{$_} = $value;
push(@fieldsToUpdate, $_);
}