From 7f6c24e7e08e604feda710fdbd3d04d860bfa34e Mon Sep 17 00:00:00 2001 From: daviddelikat Date: Sun, 15 Nov 2009 22:02:36 -0600 Subject: [PATCH] rather a lot of debugging in the EMS Submission system --- ...import_ems_ems-badge-listing-default.wgpkg | Bin 3504 -> 3510 bytes ...import_ems_ems-event-submission-main.wgpkg | Bin 2462 -> 2457 bytes ...mport_ems_ems-event-submission-queue.wgpkg | Bin 2398 -> 2398 bytes ...root_import_ems_ems-event-submission.wgpkg | Bin 1667 -> 1792 bytes lib/WebGUI/Asset/EMSSubmission.pm | 36 ++++++++--- lib/WebGUI/Asset/EMSSubmissionForm.pm | 8 ++- .../Asset/Wobject/EventManagementSystem.pm | 26 +++++--- .../i18n/English/Asset_EMSSubmission.pm | 2 +- t/Asset/EMSSubmissionForm.t | 57 ++++++++++-------- www/extras/wobject/EMS/submission.js | 2 +- 10 files changed, 82 insertions(+), 49 deletions(-) diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-badge-listing-default.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-badge-listing-default.wgpkg index d6f737f0b6ec6cfddfe60d4c214af698f22ccfc3..2ed6229b8d42f4926eb3c54f50380db657acbe90 100644 GIT binary patch literal 3510 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 literal 3504 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 X1K(%h`waY_&cJ^F2|b9-04e|g&WzZz literal 2462 zcmV;P31RjhiwFP!00000|Lt1)ZyPrf_Rsw*SQWT9Mx>SG*iIx@fLl8k7jYhEr@da( z2GlMkF^0bg#a*MH=UAZh`73>Q(cRcegZnF4|3frq zcEf)+n(qC1?UR;bLv}*q{{FsScc%eUl`em?{uFCIyZ*cTjr}cxE)V~CsP(Tsyy=_J zaPu8jp<>u5iK$^9sWCJhj+ijILR#d*A5R=z8>#4km75YJ6Q&GjuA>uUC54JXPW02Y z?OWNcIDSirsWvB9iBzB-IUX^NFF(FGmow=}$jIBU>h%*7=cD%St8Tlw?E_R`zI^_T~}F^{95FER4;yE@{c z7Ha*t-K`MCVlZfP9W$8544TY!!q8@*DnPexrE`~XLwgg>rUBKOL5sfR0^f8LWQ5IX zOXz?LiiKO$SCBTVF``&R+Kbtu#)7n2jUkqca>162u^@e+Mja}i7@}2J_7KCx^(bV) zrlUgik z#KpkA-}I1j21<@a)EcXJJIgff@(gC(YXjbYOoXf|mLPSK5V@DB?9m=FJ{X$TGd619 z{=lv%(lo1vR3N61Ve=-TkyY8MlRByGu@R}GTPFBaL_DR2%Njbq3c;))-vgI>W0*Cyd=-jWLr1Y0?u%nq>L};o z`yiQ>f-NNYS}e1^@Oz+{u7LROtJNMu5+@<5A96&7I4E1pfzuSy8v*npX2>daPaZ+J&hsdW+>oqu8Ap`{HUp$c2?DK!q{uCSg$qi7rl7baY&o7<#ob%V zy@;w-@%PO#?F-n-v3F6=$vt5fVOb|AgRHKYhgn_WfmRnzI1jbZmVvFVD8a3+m;+qd zO6RbvD?IRWMVAb89m`)|^G~Dw`0V(k9{#S(nRMXP{~wEe5H z3ARYp2aW0o1qjc|^-G5w9e<XL zyiYVsPhJzMYBWNf>W#n-?V7`+llB3@?PeuojiN(h_ivDK+xJ{h#5L-E*B9IXq+)MD z#IRYCVI1KwK;tS2EQK972zI(A-JUaMM5PXkmOv_wOC&^fP@~>r!>28aRZ$f~xg?|V z2&5tzxc1T*xc&!XnXTee11ruA?f30i@HwP;sqY6Il+KGI>kFJMQNfcUjCpto;lHuo z-`}6saIkf!xKm8~3nfQKA{8xx_H-*P@fY)K;~F$Qfxn> zq2UvTUOx}17_diAN}WR21e)cyy9@rx2jZC1SPraWyDoO{>6kGO_-9Se&P>C?mA64! zSb*0dFF0Qw$MbYg%)Q0=lfgJ)fMv2DobtRcX%?e`!=g^EDsSjk{Azbf`^NhQkKkLK zLpE9xA8aF>`!I-kZg1f}naem+f-xL49nSpZWZ+}XFL7fvhd7h5kJHD_8 z=8Mg-lRS2}iWQpRrgKuhjdZSljzx81_n+_Xdt(!-P}_5a71P;jy}USkwKxM@zmoQv zGQBySxf|vBnDyy6&fuZfR`!K-@OD9-HTHH(@KUh}w{`mC{DO7as&RKoT6j)L#ZXR9 zg#{+*bd;ultXX=qn%}cJ6H1x|JjK@*mx0|GglRW! z0d##9OJgmDHoNsw)f_txQ8F{{>E~hn@>IWgA4N~!TvboUjbHvX7MaE0i0l&oB%2S0A+92(EtDd diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission-queue.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission-queue.wgpkg index 134eb6a44ef5476ac1afbbd9dc74328a939eb481..d7d7392013be8aa80954bbffa55cc1ddedd9b5c2 100644 GIT binary patch literal 2398 zcmV-k38D5MiwFP!00000|Ls~|SKGJ}&+~o?H!p;q5GR2Wa3SYVO1Igi3oUT>-X&a) z5-W+okzGqBWI25IJCbZmcAO9>bngQ>r-|#){L#!vzZr>I>E%E5dcD^AA*PD%!_3q_OE0rR~QCO@g?FM^+#h&IV)R^b$(HmbjJM<4YBzu2>k$uoM1UniV>3fAqF|_hp8A_ zUN1|2LGTdc2e*MA0(DRF(8%*rGOR)_<(Gq~=Mgr-uI8n9@+YCLKaoP~n!u*i4;Yyh zhi`d^K4avbq9Hp*{c8{>4BGJsy|zXn9_)6@|2+_+SjC=3#O_7JbM1i-GgsehV?t|v z##Y~V%T|azU|@XeVK5DIc*UmyhIbrP*)R;=*zH2`S~^F)8-gb`Vhn>Cc1TW24lh6u$4^Gr!k(>WXDf=pmx-^iwk z-@C$nZXbL(v02m`6UK;7VLz3L1UbU`AqlvZ<+3@U({Uf$SBlK!i%aoFP{hL}a3o?( zyROg;QcT@)d&gFf^VH~Mj5zU#Sig4q^o-I4e860MDwk0_`Q@#iH!|zB_j)$T(u#j$ zt&eg@x+LuM>1oF2BCCxQ3xN4i2tn14FQ7xMzjV1hO~aBQn49iJzF$%%cx-KgdqZPe z4#%)7hhxal=afqtThta`bL7sAWV)@`>CR#&FnC zIA#EA2I_tW$aU#YhPgQkUl`~f)|xJ`XN0!>( z`{U5(zQ_Vn8)((V=Yd-yW^yM4$kyTl>?$k`gY;I6!$%Sj}TF~!X zf8yS+XPp{!Q59p97^ycB=;&8=I2>JE3hp81CuzU+RRr=Q)Z1sF*Iub=Jwig7ww92P zb#Hzwq>o_9Xc|MaStQrx`$;DX<6WMYC7ORB3_d_do|hj04iFN+WAPxEdRINe3*@?b zf?10)q`fP2o0zA$F=XUC_AITKKcnIk)Zz;)5aePhSxvKIX6dP%Yz!g)W#m2I4=f!* zAra=z#1cv!XIWJuNKfOI7zRrc*2@C|wWCis;t^XcSDg8M!+|%If)~vt z9r^WAqY%G$F z+bvfu29P06v>c0v5iW??j>-};SfEWsE2~DF6BR13Y#UN`0J#hYvN&{%-LR(Ko{HcX znIiKQ=1&75)m5`K`Hl3XiPc0`v_rWcA1 zWSo?ySed4e6qshC%v(d+AtbaVGrCA()*bo04K7pIVX*t0uV~a>sV4tXAiR?2b@2d2 z9zTIZ1lAlLik$A2VRwNeXpz4f5k=ze%jMDrd$Z;#E|-LoO9A$TxB#Lxm^C^T318bk z+&ekB%nCdTT^!~T-B_~saLg&o6QMvZn;M~nr!p%hoeV10M4s%|Jijk9wKhU*WWCvi ziGXFYL{J;KE(l;Oayw8=eG2{Y9_^3(u#%HvDv6DghNZ`&W;IFZ2#16NYzTqJCV)o z^~`af<9t5-ayaWu!VZ0L8>B9%GFMQ9eN@XVKQS}*lD56w+TMQGY8qvKh;N8E=NCJM z;!lFKW%^cJMWuXmlO=WpTfudW`rxz9O01W!P_b-kk4$+&kSne`_z( zY*be7M2pbd&9@eAdL-{G*-E6lxHHo^K*eTC(QSg+7|6arbOMg*094`VoZpH1&=3hl z$$eG5RF$B5mJ2vzChOeq?A_EVMk_ZGZs(_R(?KM-MS?gq!&KjF>a)At4!sKM+ zeHBMSbIZ*TaJrB$8>o~iQ;=jCFREt6;XF`p7!`(d7grO`f?A?1D+g!Ex}o2`2l(yH zR04qiVvYNQJbue6VD$|genb>Z19*i>T&-cWD|i16<%LW&$aScC2_04%tE=xp18Ub- z?~H6os)q`y=BkETfcQx4r>pnEUiT#2FJ|E8U9U%!9VLI^vVGT4&y8@hy&1fj|X6aX~KKcFZAXEP%W{HfR9WnmLa zo7lXK@1y#4hkZJ8-HoH$wNBLd?XTfbo0kGlY@hf;ko#ZmpW}~CUS+&`;MD`K9(eV@ QKkkA50n948Pyj3d02eNg761SM literal 2398 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 QzxKd?0WS!$FaRt700+U8Bme*a diff --git a/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission.wgpkg b/docs/upgrades/packages-7.8.5/root_import_ems_ems-event-submission.wgpkg index 4e450b23f5dbad67ee7fc3c1e6f7e82bfcf3855f..3a73724d0a3e7e96df8ec4d7bfed665b37a8b992 100644 GIT binary patch literal 1792 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 Nz<*D5p-=!I004qtHrN0F diff --git a/lib/WebGUI/Asset/EMSSubmission.pm b/lib/WebGUI/Asset/EMSSubmission.pm index d9fd4397d..52369c911 100644 --- a/lib/WebGUI/Asset/EMSSubmission.pm +++ b/lib/WebGUI/Asset/EMSSubmission.pm @@ -50,6 +50,21 @@ These methods are available from this class: =cut +#------------------------------------------------------------------- + +=head2 addComment ( comment [, rating, user ] ) + +send email when a comment is added + +=cut + +sub addComment { + my $self = shift; + $self->next::method(@_); + $self->sendEmailUpdate; +} + + #------------------------------------------------------------------- =head2 addRevision @@ -341,7 +356,7 @@ sub sendEmailUpdate { my $session = $self->session; my $i18n = WebGUI::International->new( $session, "Asset_EMSSubmission" ); if( $self->get('sendEmailOnChange') ) { - WebGUI::Inbox->new($session)->addMessage( $session,{ + WebGUI::Inbox->new($session)->addMessage( { status => 'unread', message => $i18n->get('your submission has been updated') . "\n\n" . $self->get('title'), @@ -367,7 +382,6 @@ parameters for the submission =cut - sub www_editSubmission { my $this = shift; my $self; @@ -396,11 +410,11 @@ sub www_editSubmission { $newform->hidden(name => 'assetId', value => $assetId); my $formDescription = $parent->getFormDescription; my @defs = reverse @{__PACKAGE__->definition($session)}; - my @fieldNames = qw/title submissionStatus startDate duration seatsAvailable location description/; + my @fieldNames = qw/title submissionStatus sendEmailOnChange startDate duration seatsAvailable location description/; my $fields; for my $def ( @defs ) { my $properties = $def->{properties}; - for my $fieldName ( %$properties ) { + for my $fieldName ( keys %$properties ) { if( defined $formDescription->{$fieldName} ) { $fields->{$fieldName} = { %{$properties->{$fieldName}} }; # a simple first level copy if( $fieldName eq 'description' ) { @@ -448,10 +462,11 @@ sub www_editSubmission { } } $newform->submit; - my $title = $assetId eq 'new' ? $i18n_WG->get(99) : $asset->get('title'); + my $title = $assetId eq 'new' ? $i18n->get('new submission') : $asset->get('title'); my $content = $asset->processTemplate({ errors => $params->{errors} || [], + isDynamic => $session->form->get('asJson') || 0, backUrl => $parent->getUrl, pageTitle => $title, pageForm => $newform->print, @@ -517,10 +532,10 @@ sub getEditForm { my $tabform = $self->SUPER::getEditForm; - my $comments = $tabform->getTab( 'comments' ); - - #add the comments... # TODO once comments can be submitted using AJAX this will work... + # be sure to uncomment the tab in the next function also... + #my $comments = $tabform->getTab( 'comments' ); + # $comments->div({name => 'comments', # contentCallback => sub { $self->getFormattedComments }, # }); @@ -543,7 +558,10 @@ sub getEditTabs { my $self = shift; my $i18n = WebGUI::International->new($self->session,"Asset_EMSSubmission"); my $sku_i18n = WebGUI::International->new($self->session,"Asset_Sku"); - return ($self->SUPER::getEditTabs(), ['shop', $sku_i18n->get('shop'), 9], ['comments', $i18n->get('comments'), 9]); + return ($self->SUPER::getEditTabs(), ['shop', $sku_i18n->get('shop'), 9], + # The comment tab is not available because comments are not AJAX yet... + # ['comments', $i18n->get('comments'), 9] + ); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Asset/EMSSubmissionForm.pm b/lib/WebGUI/Asset/EMSSubmissionForm.pm index 1be151d90..94fdaad19 100644 --- a/lib/WebGUI/Asset/EMSSubmissionForm.pm +++ b/lib/WebGUI/Asset/EMSSubmissionForm.pm @@ -142,7 +142,7 @@ sub definition { submissionDeadline => { tab => "properties", fieldType => "Date", - defaultValue => time , # + ( 30 * 24 * 60 * 60 ) , # 30 days + defaultValue => time + ( 30 * 24 * 60 * 60 ) , # 30 days label => $i18n->get("submission deadline label"), hoverHelp => $i18n->get("submission deadline label help") }, @@ -308,7 +308,7 @@ sub www_editSubmissionForm { my $formDescription = $params->{formDescription} || $self ? $self->getFormDescription : { }; for my $fieldId ( @fieldNames ) { - next if $fieldId eq 'submissionStatus'; + next if $fieldId =~ /^(submissionStatus|sendEmailOnChange)$/; my $field = $fields->{$fieldId}; $newform->yesNo( label => $field->{label}, @@ -328,6 +328,7 @@ sub www_editSubmissionForm { } my $content = $asset->processTemplate({ errors => $params->{errors} || [], + isDynamic => $session->form->get('asJson') || 0, backUrl => $parent->getUrl, pageTitle => $title, pageForm => $newform->print, @@ -599,8 +600,9 @@ sub processForm { } my @fieldNames = split( ' ', $form->get('fieldNames') ); $params->{formDescription} = { map { $_ => $form->get($_ . '_yesNo') } ( @fieldNames ) }; - $params->{formDescription}{_fieldList} = [ map { $params->{formDescription}{$_} ? $_ : () } ( @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; my $i18n = WebGUI::International->new( $session, "Asset_EMSSubmissionForm" ); diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index 6ded9307b..c4c32d1f0 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -259,7 +259,7 @@ sub definition { hoverHelp => $i18n->get('registration staff group help'), }, submittedLocationsList => { - fieldType => 'text', + fieldType => 'textarea', tab => 'properties', defaultValue => '', label => $i18n->get('submitted location list label'), @@ -499,7 +499,7 @@ sub getSubmissionLocations { my $self = shift; my $text = $self->get('submittedLocationsList'); return undef if $text eq ''; - return [ split( /\s+/, $text ) ]; + return [ split( /[\s\n]+/, $text ) ]; } #------------------------------------------------------------------- @@ -659,7 +659,7 @@ A WebGUI::User object. Defaults to $session->user. sub isRegistrationStaff { my $self = shift; my $user = shift || $self->session->user; - $user->isInGroup($self->get('registrationStaffGroupId')); + $user->isInGroup($self->get('registrationStaffGroupId')) || $self->canEdit; } #------------------------------------------------------------------- @@ -739,9 +739,11 @@ sub view { addBadgeUrl => $self->getUrl('func=add;class=WebGUI::Asset::Sku::EMSBadge'), buildBadgeUrl => $self->getUrl('func=buildBadge'), viewScheduleUrl => $self->getUrl('func=viewSchedule'), - addSubmissionUrl => $self->getUrl('func=viewSubmissionQueue#addSubmission'), + addSubmissionUrl => $self->getUrl('func=viewSubmissionQueue'), + # addSubmissionUrl => $self->getUrl('func=viewSubmissionQueue#addSubmission'), viewSubmissionQueueUrl => $self->getUrl('func=viewSubmissionQueue'), - addSubmissionFormUrl => $self->getUrl('func=viewSubmissionQueue#addSubmissionForm'), + addSubmissionFormUrl => $self->getUrl('func=viewSubmissionQueue'), + # addSubmissionFormUrl => $self->getUrl('func=viewSubmissionQueue#addSubmissionForm'), manageBadgeGroupsUrl=> $self->getUrl('func=manageBadgeGroups'), getBadgesUrl => $self->getUrl('func=getBadgesAsJson'), isRegistrationStaff => $self->isRegistrationStaff, @@ -842,8 +844,9 @@ call www_editSubmissionForm with assetId == new =cut sub www_addSubmissionForm { - my $self = shift; - $self->www_editSubmissionForm( { assetId => 'new' } ); + my $self = shift; + my $params = shift || { }; + $self->www_editSubmissionForm( { assetId => 'new', %$params } ); } #------------------------------------------------------------------- @@ -1068,7 +1071,7 @@ test and save data posted from editSubmissionForm... sub www_editSubmissionFormSave { my $self = shift; - return $self->session->privilege->insufficient() unless $self->isRegistrationStaff; + return $self->session->privilege->insufficient() unless $self->isRegistrationStaff || $self->canEdit; my $formParams = WebGUI::Asset::EMSSubmissionForm->processForm($self); if( $formParams->{_isValid} ) { delete $formParams->{_isValid}; @@ -2734,7 +2737,12 @@ sub www_viewSubmissionQueue { for my $tabSource ( @{$self->getSubmissionForms} ) { push @{$params->{tabs}}, $tabSource->www_editSubmissionForm( { asHashRef => 1 } ); } - $params->{tabs}[0]{selected} = 1; # the submission queue tab + if( scalar( @{$params->{tabs}} ) == 1 ) { # there were no existing forms + push @{$params->{tabs}}, $self->www_addSubmissionForm( { asHashRef => 1 } ); + $params->{tabs}[1]{selected} = 1; # the new submission form tab + } else { + $params->{tabs}[0]{selected} = 1; # the submission queue tab + } } elsif( $canSubmit ) { for my $tabSource ( @{$self->getSubmissionForms} ) { diff --git a/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm b/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm index 1472d9ee3..b0279de9f 100644 --- a/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm +++ b/lib/WebGUI/i18n/English/Asset_EMSSubmission.pm @@ -12,7 +12,7 @@ our $I18N = { ##hashref of hashes '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 eddited.| + 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|, diff --git a/t/Asset/EMSSubmissionForm.t b/t/Asset/EMSSubmissionForm.t index 789532f8a..1a9f3701e 100644 --- a/t/Asset/EMSSubmissionForm.t +++ b/t/Asset/EMSSubmissionForm.t @@ -19,6 +19,7 @@ use lib "$FindBin::Bin/../lib"; use Test::More; use Test::Deep; use Test::Warn; +use HTML::Form; use JSON; use WebGUI::Test; # Must use this before any other WebGUI modules use WebGUI::Test::Activity; @@ -96,7 +97,7 @@ my $ems = $node->addChild({ }); # I scooped this out ot WG::Asset::Wobject::EventManagementSystem # its not pretty, but there is no other way to add a meta field - $ems->setCollateral("EMSEventMetaField", "fieldId",{ +my $mf1Id = $ems->setCollateral("EMSEventMetaField", "fieldId",{ fieldId=> 'new', label => 'mfRequiredUrl', dataType => 'url', @@ -106,7 +107,7 @@ my $ems = $node->addChild({ defaultValues => '', },1,1); - $ems->setCollateral("EMSEventMetaField", "fieldId",{ +my $mf2Id = $ems->setCollateral("EMSEventMetaField", "fieldId",{ fieldId=> 'new', label => 'mfDate', dataType => 'date', @@ -243,10 +244,10 @@ cmp_deeply( from_json($ems->www_getAllSubmissions), { records => [ { lastReplyDate => '', - submissionId => '3', + submissionId => $sub1->get('submissionId'), creationDate => ignore(), createdBy => 'userA', - url => '/test-ems?func=viewSubmissionQueue#3', + url => ignore(), submissionStatus => $i18n->get('pending'), title => 'my favorite thing to talk about', lastReplyBy => '' @@ -257,10 +258,10 @@ cmp_deeply( from_json($ems->www_getAllSubmissions), { dir => 'DESC', }, 'test getAllSubmissions for UserA' ); -$session->request->setup_body({submissionId => 3}); +$session->request->setup_body({submissionId => $sub1->get('submissionId')}); cmp_deeply( from_json($ems->www_getSubmissionById), { - title => 3, - id => 3, + title => $sub1->get('submissionId'), + id => $sub1->get('submissionId'), text => ignore(), }, 'test getSubmissionById'); @@ -283,20 +284,20 @@ cmp_deeply( from_json($ems->www_getAllSubmissions), { records => [ { lastReplyDate => '', - submissionId => '4', + submissionId => $sub2->get('submissionId'), creationDate => ignore(), createdBy => 'userB', - url => '/test-ems?func=viewSubmissionQueue#4', + url => ignore(), submissionStatus => $i18n->get('pending'), title => 'why i like to be important', lastReplyBy => '' }, { lastReplyDate => '', - submissionId => '3', + submissionId => $sub1->get('submissionId'), creationDate => ignore(), createdBy => 'userA', - url => '/test-ems?func=viewSubmissionQueue#3', + url => ignore(), submissionStatus => $i18n->get('pending'), title => 'my favorite thing to talk about', lastReplyBy => '' @@ -380,13 +381,12 @@ is( $sub2, undef, 'submission deleted'); $versionTag->commit; -SKIP: { skip 'requires HTML::Form', 2 unless use_ok 'HTML::Form'; -# this is not the greatest testm but it does run through the basic create submissionForm code. +# this is not the greatest test but it does run through the basic create submissionForm code. loginRgstr; my %settings = ( assetId => 'new', - fieldNames => 'title description startDate duration seatsAvailable location nzymEeuHPQIsgXY0hZxDxA xlvMNwFi1FWwP0PrUAnxSQ', + fieldNames => "title description startDate duration seatsAvailable location $mf1Id $mf2Id", title => 'Untitled', menuTitle => 'Untitled', url => '', @@ -401,17 +401,18 @@ my %settings = ( duration_yesNo => 1, seatsAvailable_yesNo => 1, location_yesNo => 1, - nzymEeuHPQIsgXY0hZxDxA_yesNo => 1, - xlvMNwFi1FWwP0PrUAnxSQ_yesNo => 1, + $mf1Id . '_yesNo' => 1, + $mf2Id . '_yesNo' => 1, ); my $expected = { 'submissionDeadline' => '1991-06-21', 'menuTitle' => 'Untitled', - 'pastDeadlineMessage' => 'The deadline for this submission is past, no more submissions will be taken at this time.', + 'pastDeadlineMessage' => $settings{pastDeadlineMessage}, 'formDescription' => { 'location' => '1', - 'nzymEeuHPQIsgXY0hZxDxA' => 'xlvMNwFi1FWwP0PrUAnxSQ', + $mf1Id => 1, + $mf2Id => 1, 'seatsAvailable' => '1', 'duration' => '1', 'title' => '1', @@ -425,7 +426,8 @@ my $expected = { 'duration', 'seatsAvailable', 'location', - 'nzymEeuHPQIsgXY0hZxDxA' + $mf1Id, + $mf2Id, ] }, 'description' => undef, @@ -440,12 +442,16 @@ my $expected = { my $htmlText = $ems->www_addSubmissionForm; my $form = HTML::Form->parse($htmlText,'http://localhost/'); -for my $input ( $form->inputs ) { - $input->value($settings{$input->name})if exists $settings{$input->name}; +isnt( $form, undef, 'form created successfully' ); +my $result; +SKIP: { skip 'failed to create form', 1 unless $form; + for my $input ( $form->inputs ) { + $input->value($settings{$input->name})if exists $settings{$input->name}; + } + $session->request->setup_body( { $form->form } ); + $result = WebGUI::Asset::EMSSubmissionForm->processForm($ems); + cmp_deeply( $result, $expected , 'test process form -- with data' ); } -$session->request->setup_body( { $form->form } ); -my $result = WebGUI::Asset::EMSSubmissionForm->processForm($ems); -cmp_deeply( $result, $expected , 'test process form' ); $expected = { 'errors' => [ { @@ -470,8 +476,7 @@ $expected = { }; $session->request->setup_body( { } ); $result = WebGUI::Asset::EMSSubmissionForm->processForm($ems); -cmp_deeply( $result, $expected , 'test process form' ); -} # end of skip HTML::Form +cmp_deeply( $result, $expected , 'test process form -- no data' ); # these run code to see that it runs, but do not check for correctness diff --git a/www/extras/wobject/EMS/submission.js b/www/extras/wobject/EMS/submission.js index d1428a5b8..6e75870bf 100644 --- a/www/extras/wobject/EMS/submission.js +++ b/www/extras/wobject/EMS/submission.js @@ -182,7 +182,7 @@ WebGUI.EMS = function (configs) { WebGUI.EMS.i18n.get('Asset_EventManagementSystem','close tab') + '" />', contentEl: myContent }); - initHoverHelp( myTab ); + // initHoverHelp( myTab ); WebGUI.EMS.tabs.addTab( myTab ); var index = WebGUI.EMS.tabs.getTabIndex(myTab); YAHOO.util.Event.on(myTab.getElementsByClassName('close')[0], 'click', WebGUI.EMS.closeTab , myTab);