From fc7efa4d5b30ab144e74f01fbb51c075b78fe9b5 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Thu, 19 Jun 2008 16:26:32 +0000
Subject: [PATCH] More cleaning up of the upgrade file (forgot newlines). Make
 sure that the user profile template settings have a default value and
 remember their previous value.

---
 docs/upgrades/upgrade_7.5.12-7.5.13.pl | 6 +++---
 lib/WebGUI/Operation/Settings.pm       | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/upgrades/upgrade_7.5.12-7.5.13.pl b/docs/upgrades/upgrade_7.5.12-7.5.13.pl
index f7246bbc8..e61a4f13a 100644
--- a/docs/upgrades/upgrade_7.5.12-7.5.13.pl
+++ b/docs/upgrades/upgrade_7.5.12-7.5.13.pl
@@ -38,7 +38,7 @@ finish($session); # this line required
 #----------------------------------------------------------------------------
 sub fixShop {
     my $session = shift;
-    print "\tFixing Shop properties." unless $quiet;
+    print "\tFixing Shop properties.\n" unless $quiet;
     my $db = $session->db;
     $db->write("update EventManagementSystem set registrationStaffGroupId='3' where registrationStaffGroupId=''");
     my ($driverId) = $db->quickScalar("select paymentGatewayId from paymentGateway where className='WebGUI::Shop::PayDriver::ITransact'");
@@ -49,7 +49,7 @@ sub fixShop {
 #----------------------------------------------------------------------------
 sub addSelectableProfileTemplates {
     my $session = shift;
-    print "\tAdd selectable user profile templates." unless $quiet;
+    print "\tAdd selectable user profile templates.\n" unless $quiet;
     my $tmpl = $session->setting->get('viewUserProfileTemplate') || 'PBtmpl0000000000000052';
     $session->setting->remove('viewUserProfileTemplate');
     $session->setting->add('viewUserProfileTemplate', $tmpl);
@@ -61,7 +61,7 @@ sub addSelectableProfileTemplates {
 #----------------------------------------------------------------------------
 sub addCouponThankYouMessage {
     my $session = shift;
-    print "\tAdding Thank You Message to Coupon table... " unless $quiet;
+    print "\tAdding Thank You Message to Coupon table...\n" unless $quiet;
     $session->db->write('alter table FlatDiscount add column thankYouMessage mediumtext');
 }
 
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index 25949ced5..fd342569e 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -484,18 +484,20 @@ sub definition {
     push @fields, {
         tab             => "user",
         name            => 'viewUserProfileTemplate',
-        fieldType       => 'Template',
+        fieldType       => 'template',
         namespace       => 'Operation/Profile/View',
         label           => $i18n->get( 'user profile view template' ),
         hoverHelp       => $i18n->get( 'user profile view template description' ),
+        defaultValue    => $setting->get('viewUserProfileTemplate'),
     };
     push @fields, {
         tab             => "user",
         name            => 'editUserProfileTemplate',
-        fieldType       => 'Template',
+        fieldType       => 'template',
         namespace       => 'Operation/Profile/Edit',
         label           => $i18n->get( 'user profile edit template' ),
         hoverHelp       => $i18n->get( 'user profile edit template description' ),
+        defaultValue    => $setting->get('editUserProfileTemplate'),
     };
 	# auth settings 
    	my $options;