[evolvis-commits] r18435: upstream pending merges:↵ jheyman 2012-05-29 Fix user id in calculate_user_metric cronjobs↵ Roland Mas 2012-05-24 Normalize roles on forum/subproject/tracker creation in the API rather tha...

mirabilos at evolvis.org mirabilos at evolvis.org
Wed May 30 17:55:20 CEST 2012


Author: mirabilos
Date: 2012-05-30 17:55:20 +0200 (Wed, 30 May 2012)
New Revision: 18435

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php
   trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
   trunk/gforge_base/evolvisforge-5.1/src/cronjobs/calculate_user_metric.php
   trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php
Log:
upstream pending merges:
  jheyman 2012-05-29 Fix user id in calculate_user_metric cronjobs
    Roland Mas 2012-05-24 Normalize roles on forum/subproject/tracker creation in the API rather tha...

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php	2012-05-30 12:36:57 UTC (rev 18434)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/forum/Forum.class.php	2012-05-30 15:55:20 UTC (rev 18435)
@@ -225,6 +225,7 @@
 				return false;
 			}
 		}
+		$this->Group->normalizeAllRoles () ;
 		db_commit();
 		return true;
 	}

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php	2012-05-30 12:36:57 UTC (rev 18434)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/pm/ProjectGroup.class.php	2012-05-30 15:55:20 UTC (rev 18435)
@@ -175,6 +175,7 @@
 		}
 		$this->group_project_id=db_insertid($result,'project_group_list','group_project_id');
 		$this->fetchData($this->group_project_id);
+		$this->Group->normalizeAllRoles () ;
 
 		foreach (explode(',', forge_get_config('default_task_categories')) as $catname) {
 			$cat = new ProjectCategory ($this) ;

Modified: trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2012-05-30 12:36:57 UTC (rev 18434)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/tracker/ArtifactType.class.php	2012-05-30 15:55:20 UTC (rev 18435)
@@ -265,11 +265,12 @@
 				db_rollback();
 				return false;
 			} else {
+				$this->Group->normalizeAllRoles ();
 				db_commit();
 				return $id;
+			}
 		}
 	}
-	}
 
 	/**
 	 *  fetchData - re-fetch the data for this ArtifactType from the database.

Modified: trunk/gforge_base/evolvisforge-5.1/src/cronjobs/calculate_user_metric.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/cronjobs/calculate_user_metric.php	2012-05-30 12:36:57 UTC (rev 18434)
+++ trunk/gforge_base/evolvisforge-5.1/src/cronjobs/calculate_user_metric.php	2012-05-30 15:55:20 UTC (rev 18435)
@@ -76,7 +76,7 @@
 
 foreach(RBACEngine::getInstance()->getUsersByAllowedAction ('project_admin',forge_get_config('peer_rating_group')) as $u) {
 	db_query_params ('INSERT INTO user_metric0 (user_id,times_ranked,avg_raters_importance,avg_rating,metric,percentile,importance_factor) VALUES ($1,5,1.25,3,0,0,1.25)',
-			array (forge_get_config('peer_rating_group'))) ;
+			array ($u->getID())) ;
 	$err .= db_error();
 }
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php	2012-05-30 12:36:57 UTC (rev 18434)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/pm/admin/index.php	2012-05-30 15:55:20 UTC (rev 18435)
@@ -79,7 +79,6 @@
 		} else {
 			$feedback .= _('Subproject Inserted');
 			$warning_msg .= _("Please configure also the roles (by default, it's 'No Access')");
-			$g->normalizeAllRoles () ;
 		}
 
 	} else if ($add_cat) {

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php	2012-05-30 12:36:57 UTC (rev 18434)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/admin/ind.php	2012-05-30 15:55:20 UTC (rev 18435)
@@ -49,7 +49,6 @@
 			$feedback .= "<br />";
 			$feedback .= _('Please configure also the roles (by default, it\'s \'No Access\')');
 		}
-		$group->normalizeAllRoles () ;
 	}
 }
 



More information about the evolvis-commits mailing list