From b8830667cdce919b451b9cf9dbee41c5106b3eb3 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Fri, 17 Mar 2017 17:31:52 +0100
Subject: [PATCH] Second version of the VileSci interface that allows easily to
 add more prestudent to a group or change their stufe

---
 application/controllers/system/Users.php    | 27 +++++++++++++--------
 application/widgets/Usersfilters_widget.php |  1 -
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/application/controllers/system/Users.php b/application/controllers/system/Users.php
index e170671c2..05744edb7 100644
--- a/application/controllers/system/Users.php
+++ b/application/controllers/system/Users.php
@@ -36,16 +36,23 @@ class Users extends VileSci_Controller
 			$users = $returnUsers->retval;
 		}
 		
-		$viewData = array(
-			'studiengang' => $studiengang,
-			'studiensemester' => $studiensemester,
-			'gruppe' => $gruppe,
-			'reihungstest' => $reihungstest,
-			'stufe' => $stufe,
-			'users' => $users
-		);
-		
-		$this->load->view('system/users', $viewData);
+		if ($returnUsers == null || isSuccess($returnUsers))
+		{
+			$viewData = array(
+				'studiengang' => $studiengang,
+				'studiensemester' => $studiensemester,
+				'gruppe' => $gruppe,
+				'reihungstest' => $reihungstest,
+				'stufe' => $stufe,
+				'users' => $users
+			);
+			
+			$this->load->view('system/users', $viewData);
+		}
+		else if (isError($returnUsers))
+		{
+			show_error($returnUsers->retval);
+		}
 	}
 	
 	public function linkToStufe()
diff --git a/application/widgets/Usersfilters_widget.php b/application/widgets/Usersfilters_widget.php
index 8307ffc20..fe8018473 100644
--- a/application/widgets/Usersfilters_widget.php
+++ b/application/widgets/Usersfilters_widget.php
@@ -27,7 +27,6 @@ class Usersfilters_widget extends Widget
 
 		// Studiengaenge
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-		$this->StudiengangModel->resetQuery();
 		$this->StudiengangModel->addOrder('kurzbzlang');
 		$studiengaenge = $this->StudiengangModel->loadWhere(array('aktiv' => true));
 		if (hasData($studiengaenge))