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

Conflicts:
	docs/changelog/7.x.x.txt
	docs/upgrades/upgrade_7.7.19-7.8.0.pl
This commit is contained in:
Doug Bell 2009-09-09 17:26:55 -05:00
commit 65120a61cb
21 changed files with 354 additions and 57 deletions

View file

@ -25,6 +25,10 @@
- fixed #10925: Wrong message in i18n
- relabel Help in the Admin Console to Template Help
- fixed #10928: EMS Print Ticket -- Time not processed for timezone
- fixed #10889: Old Matrixs break for Admin users
- fixed #10939: Commit with Approval workflow does not show confirmation screen
- fixed #10862: Version tag contents page
- fixed #10943: ThingyRecord JS Broken
- added Subscribable AssetAspect to Wiki
7.7.19

View file

@ -34,6 +34,7 @@ my $session = start(); # this line required
reorganizeAdSpaceProperties($session);
fixTemplateSettingsFromShunt($session);
addSubscribableAspect( $session );
addMatrixColumnDefaults($session);
finish($session); # this line required
@ -79,6 +80,18 @@ sub reorganizeAdSpaceProperties {
print "DONE!\n" unless $quiet;
}
#----------------------------------------------------------------------------
# Describe what our function does
sub addMatrixColumnDefaults {
my $session = shift;
print "\tUpdate existing Matrixes with default values for maxComparisons... " unless $quiet;
$session->db->write(q|UPDATE Matrix set maxComparisons=25 where maxComparisons IS NULL|);
$session->db->write(q|UPDATE Matrix set maxComparisonsGroup=25 where maxComparisonsGroup IS NULL|);
$session->db->write(q|UPDATE Matrix set maxComparisonsPrivileged=25 where maxComparisonsPrivileged IS NULL|);
# and here's our code
print "DONE!\n" unless $quiet;
}
sub fixTemplateSettingsFromShunt {
my $session = shift;
print "\tClear isPackage and set isDefault on recently imported templates... " unless $quiet;