#4 Bugfix: empty groups and views on institution save

swissbib · Mar 27, 2014 · dac8cc9 · dac8cc9
1 parent b5e1939
commit dac8cc9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/module/Libadmin/src/Libadmin/Model/InstitutionRelation.php b/module/Libadmin/src/Libadmin/Model/InstitutionRelation.php
@@ -53,6 +53,15 @@ public function equals(InstitutionRelation $relation) {
 
 
 
+	/**
+	 * @return String
+	 */
+	public function getPrimaryKey() {
+		return $this->getIdView() . '-' . $this->getIdGroup() . '-' . $this->getIdInstitution();
+	}
+
+
+
 	public function getListLabel()
 	{
 		return 'Link info here';

diff --git a/module/Libadmin/src/Libadmin/Table/InstitutionTable.php b/module/Libadmin/src/Libadmin/Table/InstitutionTable.php
@@ -177,16 +177,18 @@ private function relationsChanged(array $oldRelations, array $newRelations) {
 		$filteredNewRelations = array();
 
 		//Filter the views that are not checked
-		foreach ($newRelations as $newRelation) {
-			if ( !($newRelation instanceof InstitutionRelation) ) return false;
-			if ( $newRelation->hasView() ) $filteredNewRelations[] = $newRelation;
+		foreach ( $newRelations as $newRelation ) {
+			if ( $newRelation->hasView() ) $filteredNewRelations[$newRelation->getPrimaryKey()] = $newRelation;
 		}
 
-		if (count($oldRelations) !== count($filteredNewRelations)) return true;
+		//Check if the numbers of relations match
+		if ( count($oldRelations) !== count($filteredNewRelations) ) return true;
 
-		for ($i=0; $i < count($oldRelations); $i++) {
-			if ( !($oldRelations[$i] instanceof InstitutionRelation) ) return false;
-			if ( !$oldRelations[$i]->equals($filteredNewRelations[$i]) ) return true;
+		//Check the relations for equality
+		foreach ( $oldRelations as $oldRelation ) {
+			$newRelation = $filteredNewRelations[$oldRelation->getPrimaryKey()];
+
+			if ( !$oldRelation->equals($newRelation) ) return true;
 		}
 
 		return false;