From e0b87268c5841c3bcf386f8565ced9847ea08f60 Mon Sep 17 00:00:00 2001 From: daviddelikat Date: Sun, 22 Nov 2009 20:32:17 -0600 Subject: [PATCH] various fixes to EMS Submissin system --- ...import_ems_ems-badge-listing-default.wgpkg | Bin 0 -> 3480 bytes ...mport_ems_ems-event-submission-queue.wgpkg | Bin 0 -> 2433 bytes docs/upgrades/upgrade_7.8.5-7.8.6.pl | 16 +++++++++++++ lib/WebGUI/Asset/EMSSubmission.pm | 22 ++++++------------ lib/WebGUI/Asset/EMSSubmissionForm.pm | 3 +-- .../Asset/Wobject/EventManagementSystem.pm | 8 +++---- .../i18n/English/Asset_EMSSubmission.pm | 10 -------- t/Asset/EMSSubmissionForm.t | 2 -- 8 files changed, 28 insertions(+), 33 deletions(-) create mode 100644 docs/upgrades/packages-7.8.6/root_import_ems_ems-badge-listing-default.wgpkg create mode 100644 docs/upgrades/packages-7.8.6/root_import_ems_ems-event-submission-queue.wgpkg diff --git a/docs/upgrades/packages-7.8.6/root_import_ems_ems-badge-listing-default.wgpkg b/docs/upgrades/packages-7.8.6/root_import_ems_ems-badge-listing-default.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..811ff0dfe12274bb2ac4780c46f6bec7b788df1f GIT binary patch literal 3480 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 GIsgE$guc`O literal 0 HcmV?d00001 diff --git a/docs/upgrades/packages-7.8.6/root_import_ems_ems-event-submission-queue.wgpkg b/docs/upgrades/packages-7.8.6/root_import_ems_ems-event-submission-queue.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..bdbe79dd836d62f9680745261f3728e27ad47af4 GIT binary patch literal 2433 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 + + $db->write(<update(lastReplyBy => $self->session->user->userId); $self->next::method(@_); $self->sendEmailUpdate; } @@ -207,13 +208,6 @@ sub definition { fieldType => "hidden", defaultValue => '{}', }, - sendEmailOnChange => { - tab => "properties", - fieldType => "yesNo", - defaultValue => 1, - label => $i18n->get("send email label"), - hoverHelp => $i18n->get("send email label help") - }, ticketId => { noFormPost => 1, fieldType => "hidden", @@ -355,15 +349,13 @@ sub sendEmailUpdate { my $self = shift; my $session = $self->session; my $i18n = WebGUI::International->new( $session, "Asset_EMSSubmission" ); - if( $self->get('sendEmailOnChange') ) { - WebGUI::Inbox->new($session)->addMessage( { - status => 'unread', + WebGUI::Inbox->new($session)->addMessage( { + status => 'unread', message => $i18n->get('your submission has been updated') . "\n\n" . - $self->get('title'), + $self->get('title'), userId => $self->get('createdBy'), sentBy => $session->user->userId, - }); - } + }); } #------------------------------------------------------------------- @@ -410,7 +402,7 @@ sub www_editSubmission { $newform->hidden(name => 'assetId', value => $assetId); my $formDescription = $parent->getFormDescription; my @defs = reverse @{__PACKAGE__->definition($session)}; - my @fieldNames = qw/title submissionStatus sendEmailOnChange startDate duration seatsAvailable location description/; + my @fieldNames = qw/title submissionStatus startDate duration seatsAvailable location description/; my $fields; for my $def ( @defs ) { my $properties = $def->{properties}; @@ -462,7 +454,7 @@ sub www_editSubmission { } } $newform->submit; - my $title = $assetId eq 'new' ? $i18n->get('new submission') : $asset->get('title'); + my $title = $asset->get('title'); my $content = $asset->processTemplate({ errors => $params->{errors} || [], diff --git a/lib/WebGUI/Asset/EMSSubmissionForm.pm b/lib/WebGUI/Asset/EMSSubmissionForm.pm index f241eba46..085ecfd3d 100644 --- a/lib/WebGUI/Asset/EMSSubmissionForm.pm +++ b/lib/WebGUI/Asset/EMSSubmissionForm.pm @@ -277,7 +277,7 @@ sub www_editSubmissionForm { my $formDescription = $params->{formDescription} || $self ? $self->getFormDescription : { }; for my $fieldId ( @fieldNames ) { - next if $fieldId =~ /^(submissionStatus|sendEmailOnChange)$/; + next if $fieldId eq 'submissionStatus'; my $field = $fields->{$fieldId}; $newform->yesNo( label => $field->{label}, @@ -474,7 +474,6 @@ sub processForm { my @fieldNames = split( ' ', $form->get('fieldNames') ); $params->{formDescription} = { map { $_ => $form->get($_ . '_yesNo') } ( @fieldNames ) }; $params->{formDescription}{submissionStatus} = 0; - $params->{formDescription}{sendEmailOnChange} = 1; $params->{formDescription}{_fieldList} = [ map { $params->{formDescription}{$_} ? $_ : () } ( @fieldNames ) ]; if( scalar( @{$params->{formDescription}{_fieldList}} ) == 0 ) { $params->{_isValid} = 0; diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index c4c32d1f0..78394896b 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -499,7 +499,7 @@ sub getSubmissionLocations { my $self = shift; my $text = $self->get('submittedLocationsList'); return undef if $text eq ''; - return [ split( /[\s\n]+/, $text ) ]; + return [ split( /[\n]+/, $text ) ]; } #------------------------------------------------------------------- @@ -2737,8 +2737,8 @@ sub www_viewSubmissionQueue { for my $tabSource ( @{$self->getSubmissionForms} ) { push @{$params->{tabs}}, $tabSource->www_editSubmissionForm( { asHashRef => 1 } ); } - if( scalar( @{$params->{tabs}} ) == 1 ) { # there were no existing forms - push @{$params->{tabs}}, $self->www_addSubmissionForm( { asHashRef => 1 } ); + push @{$params->{tabs}}, $self->www_addSubmissionForm( { asHashRef => 1 } ); + if( scalar( @{$params->{tabs}} ) == 2 ) { # there were no existing forms $params->{tabs}[1]{selected} = 1; # the new submission form tab } else { $params->{tabs}[0]{selected} = 1; # the submission queue tab @@ -2749,7 +2749,7 @@ sub www_viewSubmissionQueue { next unless $tabSource->canSubmit; push @{$params->{tabs}}, $tabSource->www_addSubmission( { asHashRef => 1 } ); } - $params->{tabs}[$#{$params->{tabs}}]{selected} = 1; + $params->{tabs}[0]{selected} = 1; } my $tabid = 'tab01'; for my $tab ( @{$params->{tabs}} ) { $tab->{id} = $tabid ++; } diff --git a/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm b/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm index b0279de9f..9d3c8bd8a 100644 --- a/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm +++ b/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm @@ -9,16 +9,6 @@ our $I18N = { ##hashref of hashes lastUpdated => 1131394072, context => q|Then name of the Asset ( Event Management System - Event Submission ).| }, - 'send email label' => { - message => q|Send Email when Submission Editted|, - lastUpdated => 1131394072, - context => q|This is the lable for the flag for setting the option to send email to the owner when the submission is edited.| - }, - 'send email label help' => { - message => q|Check this box if you would like to recieve email for all changes made to your submission|, - lastUpdated => 1131394072, - context => q|This is the help text for the 'send email' flag. If set to 'Yes', the user will recieve email for every change made to the submission.| - }, 'comments' => { message => q|Comments|, diff --git a/t/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t index b9545e944..dd3d16fd4 100644 --- a/t/Asset/EMSSubmissionForm.t +++ b/t/Asset/EMSSubmissionForm.t @@ -419,7 +419,6 @@ my $expected = { 'startDate' => '1', 'description' => '1', 'submissionStatus' => '0', - sendEmailOnChange => 1, '_fieldList' => [ 'title', 'description', @@ -465,7 +464,6 @@ $expected = { 'formDescription' => { '_fieldList' => [], 'submissionStatus' => 0, - sendEmailOnChange => 1, }, 'description' => undef, '_isValid' => 0,