merged from HEAD

docs/changelog/7.x.x.txt

@@ -1,4 +1,8 @@
 7.7.1
+ - rfe #9353: Welcome message template (SDH Consulting Group)
+ - rfe #10007: New Month and Year question type.  If required, Month must be selected and a 4 digit year must be entered.
+ - fixed #10011: Wrong spelling of "Descendant" in Navigation Asset Help function (Rob Schipper/NFIA India)
+ - rfe #9098: Thingy Thing-copy function (SDH Consulting Group)
 
 7.7.0
  - fixed #9913: New Content Side Bar missing in Asset window

docs/create.sql

@@ -971,6 +971,7 @@ CREATE TABLE `RSSCapable` (
   `rssCapableRssEnabled` int(11) NOT NULL default '1',
   `rssCapableRssTemplateId` char(22) NOT NULL default 'PBtmpl0000000000000142',
   `rssCapableRssFromParentId` char(22) default NULL,
+  `rssCapableRssLimit` integer default '10',
   PRIMARY KEY  (`assetId`,`revisionDate`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;

docs/upgrades/upgrade_7.6.14-7.7.0.pl

@@ -123,7 +123,7 @@ sub installAssetHistory {
     print "\tAdding Asset History content handler... \n" unless $quiet;
     ##Content Handler
     my $contentHandlers = $session->config->get('contentHandlers');
-    if (! isIn('WebGUI::Content::Handler', @{ $contentHandlers }) ) {
+    if (! isIn('WebGUI::Content::AssetHistory', @{ $contentHandlers }) ) {
         my @newHandlers = ();
         foreach my $handler (@{ $contentHandlers }) {
             push @newHandlers, $handler;

docs/upgrades/upgrade_7.7.0-7.7.1.pl

@@ -32,9 +32,54 @@ my $session = start(); # this line required
 
 # upgrade functions go here
 adSkuInstall($session);
+addWelcomeMessageTemplateToSettings( $session );
+addStatisticsCacheTimeoutToMatrix( $session );
+
+# image mods
+addImageAnnotation($session);
+
+# rss mods
+addRssLimit($session);
 
 finish($session); # this line required
 
+sub addWelcomeMessageTemplateToSettings {
+    my $session = shift;
+    print "\tAdding welcome message template to settings \n" unless $quiet;
+
+    $session->db->write("insert into settings values ('webguiWelcomeMessageTemplate', 'PBtmpl0000000000000015');");
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub addRssLimit {
+    my $session = shift;
+    print "\tAdding rssLimit to RSSCapable table, if needed... \n" unless $quiet;
+    my $sth = $session->db->read('describe RSSCapable rssCableRssLimit');
+    if (! defined $sth->hashRef) {
+        $session->db->write("alter table RSSCapable add column rssCableRssLimit integer");
+    }
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub addImageAnnotation {
+    my $session = shift;
+    print "\tAdding annotations to ImageAsset table, if needed... \n" unless $quiet;
+    my $sth = $session->db->read('describe ImageAsset annotations');
+    if (! defined $sth->hashRef) {
+        $session->db->write("alter table ImageAsset add column annotations mediumtext");
+    }
+    print "Done.\n" unless $quiet;
+}
+
+#----------------------------------------------------------------------------
+sub addStatisticsCacheTimeoutToMatrix{
+    my $session = shift;
+    print "\tAdding statisticsCacheTimeout setting to Matrix table... \n" unless $quiet;
+    $session->db->write("alter table Matrix add statisticsCacheTimeout int(11) not null default 3600");
+    print "Done.\n" unless $quiet;
+}
 
 #----------------------------------------------------------------------------
 # Describe what our function does