Merge branch 'master' of git@github.com:plainblack/webgui

Conflicts:

	docs/upgrades/upgrade_7.8.0-7.8.1.pl

docs/changelog/7.x.x.txt

@@ -1,4 +1,5 @@
 7.8.1
+ - mark $session->datetime->time as deprecated and remove its use from core code
  - fixed: Wikis broken by 7.8.0 upgrade
  - fixed #11024: In/Out Board Busted
  - fixed #11025: Yo dudely in Wiki Keyword Search Template
@@ -32,6 +33,14 @@
  - fixed #11076: WebGUI::Account::Friends message_rpp
  - fixed #11067: My Purchases Detail Template - Status Message broken
  - fixed #11081: Prop style in 7.8.0?
+ - fixed #11083: TGC template bug fixes, round #1
+ - fixed #10544: Child assets under uncommitted parents
+ - fixed failure in test 250 of t/00_compile.t
+ - fixed #11084: option to view private profiles
+ - fixed #11082: Admin group in Visitor group?
+ - fixed #11049: form caching incorrectly
+ - fixed #11088: i18n Survey Section Information
+ - fixed #11087: SC asset repeats its own description in feeds
 
 7.8.0
  - upgraded YUI to 2.8.0r4

docs/upgrades/_upgrade.skeleton

@@ -106,7 +106,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.6.14-7.7.0.pl

@@ -398,7 +398,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.6.35-7.7.17.pl

@@ -2015,7 +2015,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.0-7.7.1.pl

@@ -213,7 +213,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.1-7.7.2.pl

@@ -262,7 +262,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.10-7.7.11.pl

@@ -175,7 +175,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.11-7.7.12.pl

@@ -150,7 +150,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.12-7.7.13.pl

@@ -129,7 +129,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.13-7.7.14.pl

@@ -105,7 +105,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.14-7.7.15.pl

@@ -199,7 +199,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.15-7.7.16.pl

@@ -174,7 +174,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.16-7.7.17.pl

@@ -221,7 +221,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.17-7.7.18.pl

@@ -166,7 +166,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.18-7.7.19.pl

@@ -215,7 +215,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.2-7.7.3.pl

@@ -184,7 +184,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.20-7.8.0.pl

@@ -280,7 +280,7 @@ sub finish {
     upgradeToYUI28( $session );
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.3-7.7.4.pl

@@ -323,7 +323,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.4-7.7.5.pl

@@ -317,7 +317,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.5-7.7.6.pl

@@ -413,7 +413,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.6-7.7.7.pl

@@ -348,7 +348,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.7-7.7.8.pl

@@ -187,7 +187,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.8-7.7.9.pl

@@ -169,7 +169,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.7.9-7.7.10.pl

@@ -112,7 +112,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }
 

docs/upgrades/upgrade_7.8.0-7.8.1.pl

@@ -38,6 +38,7 @@ removeSQLFormTables( $session );
 fixBadRevisionDateColumns( $session );
 addEMSSubmission( $session );
 removeImportCruft( $session );
+removeAdminFromVisitorGroup( $session );
 
 finish($session); # this line required
 
@@ -51,6 +52,7 @@ finish($session); # this line required
 #    print "DONE!\n" unless $quiet;
 #}
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub fixBadRevisionDateColumns {
     my $session = shift;
@@ -63,6 +65,7 @@ sub fixBadRevisionDateColumns {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeSQLFormTables {
     my $session = shift;
@@ -70,11 +73,12 @@ sub removeSQLFormTables {
     my $tablesUsed = $session->db->quickScalar("select count(*) from asset where className='WebGUI::Asset::Wobject::SQLForm'");
     if (!$tablesUsed) {
         $session->db->write('DROP TABLE IF EXISTS SQLForm_fieldOrder');
-        print "\n\t\tSQL Form not used, dropping table...";
+        print "\n\t\tSQL Form not used, dropping table..." unless $quiet;
     }
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeOldSubscriptionTables {
     my $session = shift;
@@ -85,6 +89,7 @@ sub removeOldSubscriptionTables {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeOldITransactTables {
     my $session = shift;
@@ -93,6 +98,17 @@ sub removeOldITransactTables {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub removeAdminFromVisitorGroup {
+    my $session = shift;
+    print "\tRemoving Admin group from Visitor group... " unless $quiet;
+    $session->db->write("delete from groupGroupings where groupId='3' and inGroup='1'");
+    print "Done.\n" unless $quiet;
+}
+
+
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub fixWikis {
     my $session = shift;
@@ -102,6 +118,7 @@ sub fixWikis {
     print "Done.\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub fixEMSTemplates {
     my $session = shift;
@@ -163,6 +180,7 @@ ESQL
     print "DONE!\n" unless $quiet;
 }
 
+#----------------------------------------------------------------------------
 # Describe what our function does
 sub removeImportCruft {
     my $session = shift;
@@ -236,7 +254,7 @@ sub finish {
     updateTemplates($session);
     my $versionTag = WebGUI::VersionTag->getWorking($session);
     $versionTag->commit;
-    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".$session->datetime->time().")");
+    $session->db->write("insert into webguiVersion values (".$session->db->quote($toVersion).",'upgrade',".time().")");
     $session->close();
 }