merging 7.1.3 changes

docs/changelog/7.x.x.txt

@@ -32,6 +32,7 @@
    (Martin Kamerbeek / Procolix)
  - Fixed a bug in the Poll where using graphs could result in errors. See 
    gotcha.txt for details. (Martin Kamerbeek / Procolix)
+ - Added some additional indicies for slightly better performance.
 
 7.1.2
  - Fixed a bug where logging in/out would cause a blank page display.

docs/upgrades/upgrade_7.1.2-7.1.3.pl

@@ -22,10 +22,24 @@ my $session = start(); # this line required
 
 insertAutomaticLDAPRegistrationSetting($session);
 changeGraphConfigColumnType($session);
-
+addIndicies($session);
 finish($session); # this line required
 
 
+#-------------------------------------------------
+sub addIndicies {
+	my $session = shift;
+	print "\tAdding database table indicies to improve performance.\n" unless ($quiet);
+	my $db = $session->db;
+	$db->write("alter table template add index namespace_showInForms (namespace, showInForms)");	
+	$db->write("alter table groups add index groupName (groupName)");	
+	$db->write("alter table Product_feature add index assetId (assetId)");	
+	$db->write("alter table Product_benefit add index assetId (assetId)");	
+	$db->write("alter table Product_specification add index assetId (assetId)");	
+	$db->write("alter table DataForm_field add index assetId_tabId (assetId,DataForm_tabId)");	
+	$db->write("alter table Post add index threadId_rating (threadId, rating)");	
+}
+
 #-------------------------------------------------
 sub insertAutomaticLDAPRegistrationSetting {
 	my $session = shift;

lib/WebGUI/Asset/Template.pm

@@ -132,7 +132,7 @@ sub getEditForm {
 		value=>$self->session->form->get("returnUrl")
 		});
 	if ($self->getValue("namespace") eq "") {
-		my $namespaces = $self->session->dbSlave->buildHashRef("select distinct(namespace),namespace from template order by namespace");
+		my $namespaces = $self->session->dbSlave->buildHashRef("select distinct(namespace) from template order by namespace");
 		$tabform->getTab("properties")->combo(
 			-name=>"namespace",
 			-options=>$namespaces,