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

Conflicts:

	lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
	lib/WebGUI/i18n/English/Asset_EventManagementSystem.pm
This commit is contained in:
daviddelikat 2009-10-31 10:05:59 -05:00
commit b645d3e1b2
44 changed files with 941 additions and 577 deletions

View file

@ -27,6 +27,10 @@
- fixed #11181: ableToBeFriend label not i18n
- fixed #11179: user.CanStartThread missing from help
- fixed #11183: Calendar List View
- fixed #11135: Tree Navigation menu template shows a drop down fly-out menu
- fixed #10984: Edit Survey Screen isn't right in demo
- added: getTopKeywords method to Keywords API
- added: print remaining tickets feature to EMS
7.8.2
- Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi)

Binary file not shown.

View file

@ -40,9 +40,21 @@ addTrashAdminSetting($session);
addPickLanguageMacro($session);
installSetLanguage($session);
i18nAbleToBeFriend($session);
addEMSEnhancements($session);
finish($session); # this line required
#----------------------------------------------------------------------------
sub addEMSEnhancements {
my $session = shift;
print "\tAdding EMS Enhancements, if needed... " unless $quiet;
my $sth = $session->db->read('describe EventManagementSystem printRemainingTicketsTemplateId');
if (! defined $sth->hashRef) {
$session->db->write("alter table EventManagementSystem add column printRemainingTicketsTemplateId char(22) not null default 'hreA_bgxiTX-EzWCSZCZJw' after printTicketTemplateId");
}
print "Done.\n" unless $quiet;
}
#----------------------------------------------------------------------------
sub i18nAbleToBeFriend {
my $session = shift;