Fix

owncloud · Mar 31, 2016 · 951bc09 · 951bc09
1 parent 69207c9
commit 951bc09
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/js/components/contactList/contactList_controller.js b/js/components/contactList/contactList_controller.js
@@ -77,7 +77,7 @@ angular.module('contactsApp')
 	var unbindListWatch = $scope.$watch('ctrl.contactList', function() {
 		if(ctrl.contactList && ctrl.contactList.length > 0) {
 			// Check if a specific uid is requested
-			if($routeParams.uid) {
+			if($routeParams.uid && $routeParams.gid) {
 				ctrl.contactList.forEach(function(contact) {
 					if(contact.uid() === $routeParams.uid) {
 						ctrl.setSelectedId($routeParams.uid);

diff --git a/js/filters/contactGroup_filter.js b/js/filters/contactGroup_filter.js
@@ -22,6 +22,10 @@ angular.module('contactsApp')
 				}
 			}
 		}
-		return filter;
+		if(filter.length==0) {
+			return contacts;
+		} else {
+			return filter;
+		}
 	};
 });