You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/01/24 11:16:31 UTC

svn commit: r1560930 - in /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web: user/calendar/AppointmentDialog.java util/UserChoiceProvider.java

Author: solomax
Date: Fri Jan 24 10:16:30 2014
New Revision: 1560930

URL: http://svn.apache.org/r1560930
Log:
[OPENMEETINGS-883] result duplication while adding new external attendee is fixed

Modified:
    openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
    openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java

Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1560930&r1=1560929&r2=1560930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java Fri Jan 24 10:16:30 2014
@@ -333,7 +333,6 @@ public class AppointmentDialog extends A
 		
 		@Override
 		protected void onValidate() {
-			Appointment a = getModelObject();
 			if (end.getConvertedInput().before(start.getConvertedInput())) {
 				error(WebSession.getString(1592));
 			}

Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java?rev=1560930&r1=1560929&r2=1560930&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/UserChoiceProvider.java Fri Jan 24 10:16:30 2014
@@ -100,7 +100,7 @@ public class UserChoiceProvider extends 
 		UserDao dao = getBean(UserDao.class);
 		response.addAll(dao.get(term, page * PAGE_SIZE, PAGE_SIZE, null, getUserId()));
 
-		response.setHasMore(page < dao.count() % PAGE_SIZE);
+		response.setHasMore(page < dao.count(term, getUserId()) % PAGE_SIZE);
 	}
 
 	@Override