[evolvis-commits] r14563: Merged from 5.0: Fixed group join request check for forge admins and Fixed bug closing time

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 04:23:28 CET 2011


Author: mirabilos
Date: 2011-02-28 04:23:28 +0100 (Mon, 28 Feb 2011)
New Revision: 14563

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/common/include/GroupJoinRequest.class.php
   trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class.php
Log:
Merged from 5.0: Fixed group join request check for forge admins and Fixed bug closing time

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/include/GroupJoinRequest.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/include/GroupJoinRequest.class.php	2011-02-28 03:23:24 UTC (rev 14562)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/include/GroupJoinRequest.class.php	2011-02-28 03:23:28 UTC (rev 14563)
@@ -106,8 +106,10 @@
 		}
 
 		// Check if user is already a member of the project
-		$perm =& $this->Group->getPermission( user_get_object($user_id) );
-		if ($perm && is_object($perm) && $perm->isMember()) {
+		$result = db_query_params ('SELECT * FROM user_group WHERE group_id=$1 AND user_id=$2',
+					   array ($this->Group->getID(),
+						  $user_id)) ;
+		if (db_numrows($result)) {
 			$this->setError(_('You are already a member of this project.'));
 			return false;
 		}

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class.php	2011-02-28 03:23:24 UTC (rev 14562)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/common/tracker/Artifact.class.php	2011-02-28 03:23:28 UTC (rev 14563)
@@ -988,15 +988,10 @@
 			$changes['status'] = 1;
 			$update = true;
 
-			//
-			//	Enter the timestamp if we are changing to closed
-			//
 			if ($status_id != 1) {
-				$sqlu .= " close_date='".time()."', ";
+				$close_date = time () ;
 			} else {
-				// Reset the close_date if bug is re-opened 
-				// (otherwise stat reports will be wrong).
-				$sqlu .= " close_date='0', ";
+				$close_date = 0 ;
 			}
 			$this->addHistory('close_date', $this->getCloseDate());
 		}



More information about the evolvis-commits mailing list