[evolvis-commits] r18400: r15506: fix copying enabled plugins from template project during approval

mirabilos at evolvis.org mirabilos at evolvis.org
Fri May 11 17:15:57 CEST 2012


Author: mirabilos
Date: 2012-05-11 17:15:56 +0200 (Fri, 11 May 2012)
New Revision: 18400

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
Log:
r15506: fix copying enabled plugins from template project during approval

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2012-05-11 15:15:51 UTC (rev 18399)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php	2012-05-11 15:15:56 UTC (rev 18400)
@@ -2606,13 +2606,27 @@
 				}
 			}
 
-			// Disabled to keep user choice from registration page.
-//			$this->setUseSCM ($template->usesSCM()) ;
+			if (0) {
+				/* use SCM plugin from template group */
+				$this->setUseSCM($template->usesSCM());
 
-			foreach ($template->getPlugins() as $plugin_id => $plugin_name) {
-				if (preg_match('/^scm/', $plugin_name) && ($plugin_name != 'scmhook')) {
+				foreach ($template->getPlugins() as
+				    $plugin_id => $plugin_name) {
 					$this->setPluginUse($plugin_name);
 				}
+			} else {
+				/* use SCM choice from registration page */
+
+				foreach ($template->getPlugins() as
+				    $plugin_id => $plugin_name) {
+					if (substr($plugin_name, 3) == 'scm' &&
+					    $plugin_name != 'scmhook') {
+						/* skip copying scm plugins */
+						continue;
+					}
+					/* enable other plugins though */
+					$this->setPluginUse($plugin_name);
+				}
 			}
 
 			foreach ($template->getRoles() as $oldrole) {



More information about the evolvis-commits mailing list