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 2013/04/30 06:03:51 UTC

svn commit: r1477469 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java

Author: solomax
Date: Tue Apr 30 04:03:51 2013
New Revision: 1477469

URL: http://svn.apache.org/r1477469
Log:
[OPENMEETINGS-560] unique key check was broken, fixed

Modified:
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java?rev=1477469&r1=1477468&r2=1477469&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigForm.java Tue Apr 30 04:03:51 2013
@@ -56,7 +56,7 @@ public class ConfigForm extends AdminBas
 		target.appendJavaScript("omConfigPanelInit();");
 	}
 	
-	public ConfigForm(String id, WebMarkupContainer listContainer, final Configuration configuration) {
+	public ConfigForm(String id, WebMarkupContainer listContainer, Configuration configuration) {
 		super(id, new CompoundPropertyModel<Configuration>(configuration));
 		setOutputMarkupId(true);
 		this.listContainer = listContainer;
@@ -65,7 +65,7 @@ public class ConfigForm extends AdminBas
 
 			public void validate(IValidatable<String> validatable) {
 				Configuration c = getConfigDao().forceGet(validatable.getValue());
-				if (c != null && !c.getConfiguration_id().equals(configuration.getConfiguration_id())) {
+				if (c != null && !c.getConfiguration_id().equals(ConfigForm.this.getModelObject().getConfiguration_id())) {
 					error(WebSession.getString(1544L));
 				}
 			}