diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 240ab72f9..b9057f05f 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,6 +1,7 @@ 7.6.5 - fixed #8800: Errors in POD of Asset-related mix-in modules (Bernd Kalbfuß-Zimmermann) - fixed: Products imported into the Shelf have bad URLs + - fixed: #9147: Misspellings in Account 7.6.4 - Survey now will show progress and time limit. diff --git a/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-inbox-error-template.wgpkg b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-inbox-error-template.wgpkg new file mode 100644 index 000000000..e5aeb5166 Binary files /dev/null and b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-inbox-error-template.wgpkg differ diff --git a/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invitation-confirmation-template.wgpkg b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invitation-confirmation-template.wgpkg new file mode 100644 index 000000000..1562d668f Binary files /dev/null and b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invitation-confirmation-template.wgpkg differ diff --git a/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invite-user-email-template.wgpkg b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invite-user-email-template.wgpkg new file mode 100644 index 000000000..240c2c54e Binary files /dev/null and b/docs/upgrades/packages-7.6.5/root_import_account_inbox_default-invite-user-email-template.wgpkg differ diff --git a/docs/upgrades/upgrade_7.6.4-7.6.5.pl b/docs/upgrades/upgrade_7.6.4-7.6.5.pl index c66235849..02a4c77cf 100644 --- a/docs/upgrades/upgrade_7.6.4-7.6.5.pl +++ b/docs/upgrades/upgrade_7.6.4-7.6.5.pl @@ -25,11 +25,11 @@ use WebGUI::Asset; my $toVersion = "7.6.5"; # make this match what version you're going to my $quiet; # this line required - my $session = start(); # this line required -# upgrade functions go here +fixAccountMisspellings( $session ); +# upgrade functions go here finish($session); # this line required @@ -42,6 +42,23 @@ finish($session); # this line required # print "DONE!\n" unless $quiet; #} +#---------------------------------------------------------------------------- +#Describe what our function does +sub fixAccountMisspellings { + my $session = shift; + my $setting = $session->setting; + print "\tFix misspellings in Account settings... " unless $quiet; + # and here's our code + $setting->add("profileViewTemplateId", $setting->get('profileViewTempalteId') ); + $setting->add("profileErrorTemplateId", $setting->get('profileErrorTempalteId') ); + $setting->add("inboxLayoutTemplateId", $setting->get('inboxLayoutTempalteId') ); + $setting->add("friendsLayoutTemplateId", $setting->get('friendsLayoutTempalteId')); + $setting->remove("profileViewTemplateId"); + $setting->remove("profileErrorTemplateId"); + $setting->remove("inboxLayoutTemplateId"); + $setting->remove("friendsLayoutTemplateId"); + print "DONE!\n" unless $quiet; +} # -------------- DO NOT EDIT BELOW THIS LINE -------------------------------- diff --git a/lib/WebGUI/Account/Friends.pm b/lib/WebGUI/Account/Friends.pm index f0d90375d..a56a9f7f1 100644 --- a/lib/WebGUI/Account/Friends.pm +++ b/lib/WebGUI/Account/Friends.pm @@ -96,7 +96,7 @@ sub editSettingsForm { hoverHelp => $i18n->get("friends style template hoverHelp") ); $f->template( - name => "friendsLayoutTempalteId", + name => "friendsLayoutTemplateId", value => $self->getLayoutTemplateId, namespace => "Account/Layout", label => $i18n->get("friends layout template label"), @@ -166,7 +166,7 @@ sub editSettingsFormSave { my $form = $session->form; $setting->set("friendsStyleTemplateId", $form->process("friendsStyleTemplateId","template")); - $setting->set("friendsLayoutTempalteId", $form->process("friendsLayoutTempalteId","template")); + $setting->set("friendsLayoutTemplateId", $form->process("friendsLayoutTemplateId","template")); $setting->set("friendsViewTemplateId", $form->process("friendsViewTemplateId","template")); $setting->set("friendsEditTemplateId",$form->process("friendsEditTemplateId","template")); $setting->set("friendsSendRequestTemplateId",$form->process("friendsSendRequestTemplateId","template")); @@ -226,7 +226,7 @@ This method returns the template ID for the account layout. sub getLayoutTemplateId { my $self = shift; - return $self->session->setting->get("friendsLayoutTempalteId") || "zrNpGbT3odfIkg6nFSUy8Q"; + return $self->session->setting->get("friendsLayoutTemplateId") || "zrNpGbT3odfIkg6nFSUy8Q"; } diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm index 98d6b799e..6e1f39685 100644 --- a/lib/WebGUI/Account/Inbox.pm +++ b/lib/WebGUI/Account/Inbox.pm @@ -103,7 +103,7 @@ sub editSettingsForm { hoverHelp => $i18n->get("inbox style template hoverHelp") ); $f->template( - name => "inboxLayoutTempalteId", + name => "inboxLayoutTemplateId", value => $self->getLayoutTemplateId, namespace => "Account/Layout", label => $i18n->get("inbox layout template label"), @@ -198,7 +198,7 @@ sub editSettingsForm { ); $f->template( name => "inboxInviteUserMessageTemplateId", - value => $self->getInviteUserMessageTempalteId, + value => $self->getInviteUserMessageTemplateId, namespace => "Account/Inbox/InviteUserMessage", label => $i18n->get("invite user message template label"), hoverHelp => $i18n->get("invite user message template hoverHelp") @@ -237,7 +237,7 @@ sub editSettingsFormSave { #Messages Settings $setting->set("inboxStyleTemplateId", $form->process("inboxStyleTemplateId","template")); - $setting->set("inboxLayoutTempalteId", $form->process("inboxLayoutTempalteId","template")); + $setting->set("inboxLayoutTemplateId", $form->process("inboxLayoutTemplateId","template")); $setting->set("inboxViewTemplateId", $form->process("inboxViewTemplateId","template")); $setting->set("inboxViewMessageTemplateId",$form->process("inboxViewMessageTemplateId","template")); $setting->set("inboxSendMessageTemplateId",$form->process("inboxSendMessageTemplateId","template")); @@ -305,13 +305,13 @@ sub getInvitationConfirmTemplateId { #------------------------------------------------------------------- -=head2 getInviteUserMessageTempalteId ( ) +=head2 getInviteUserMessageTemplateId ( ) This method returns the template ID for the user email message =cut -sub getInviteUserMessageTempalteId { +sub getInviteUserMessageTemplateId { my $self = shift; return $self->session->setting->get("inboxInviteUserMessageTemplateId") || "XgcsoDrbC0duVla7N7JAdw"; } @@ -352,7 +352,7 @@ This method returns the template ID for the account layout. sub getLayoutTemplateId { my $self = shift; - return $self->session->setting->get("inboxLayoutTempalteId") || "gfZOwaTWYjbSoVaQtHBBEw"; + return $self->session->setting->get("inboxLayoutTemplateId") || "gfZOwaTWYjbSoVaQtHBBEw"; } @@ -755,7 +755,7 @@ sub www_inviteUserSave { $session->url->getSiteURL,'op=auth;method=createAccount;code='.$inviteId ); - my $emailBody = $self->processTemplate($var,$self->getInviteUserMessageTempalteId); + my $emailBody = $self->processTemplate($var,$self->getInviteUserMessageTemplateId); ##Create the invitation record. my $hash = { diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm index d4f42bbee..c46ffccdd 100644 --- a/lib/WebGUI/Account/Profile.pm +++ b/lib/WebGUI/Account/Profile.pm @@ -207,7 +207,7 @@ sub editSettingsFormSave { $setting->set("profileLayoutTemplateId", $form->process("profileLayoutTemplateId","template")); $setting->set("profileDisplayLayoutTemplateId", $form->process("profileDisplayLayoutTemplateId","template")); $setting->set("profileEditTemplateId", $form->process("profileEditTemplateId","template")); - $setting->set("profileViewTempalteId", $form->process("profileViewTemplateId","template")); + $setting->set("profileViewTemplateId", $form->process("profileViewTemplateId","template")); $setting->set("profileErrorTemplateId",$form->process("profileErrorTemplateId","template")); }