Author: sebawagner
Date: Sat Sep 29 07:54:54 2012
New Revision: 1391768
URL: http://svn.apache.org/viewvc?rev=1391768&view=rev
Log:
OPENMEETINGS-429 Fix lang combo box refresh after lang add, f
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/AddLanguageForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangForm.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/AddLanguageForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/AddLanguageForm.java?rev=1391768&r1=1391767&r2=1391768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/AddLanguageForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/AddLanguageForm.java
Sat Sep 29 07:54:54 2012
@@ -31,12 +31,17 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+/**
+ *
+ * @author solomax, swagner
+ *
+ */
public class AddLanguageForm extends Form<Void> {
private static final long serialVersionUID = 8743289610974962636L;
private String newLanguageName;
private String newLanguageISO;
- public AddLanguageForm(String id) {
+ public AddLanguageForm(String id, final LangPanel langPanel) {
super(id);
add(new RequiredTextField<String>("name", new
PropertyModel<String>(this, "newLanguageName")));
@@ -63,6 +68,8 @@ public class AddLanguageForm extends For
// TODO add feedback message
e.printStackTrace();
}
+
+ langPanel.getLangForm().updateLanguages(target);
/* FIXME
languages.setChoices(langDao.getLanguages());
target.add(languages);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangForm.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangForm.java?rev=1391768&r1=1391767&r2=1391768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangForm.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangForm.java
Sat Sep 29 07:54:54 2012
@@ -43,10 +43,16 @@ import org.apache.wicket.util.time.Durat
public class LangForm extends Form<Void> {
private static final long serialVersionUID = 2837702941211636609L;
- private final WebMarkupContainer listContainer;
- private final LangPanel langPanel;
private DropDownChoice<FieldLanguage> languages;
+ public void updateLanguages(AjaxRequestTarget target) {
+ FieldLanguageDaoImpl langDao = Application
+ .getBean(FieldLanguageDaoImpl.class);
+ languages.setChoices(langDao.getLanguages());
+ // add(languages);
+ target.add(languages);
+ }
+
/**
* Render Main
*
@@ -55,11 +61,10 @@ public class LangForm extends Form<Void>
* @param language
* @param langPanel
*/
- public LangForm(String id, final WebMarkupContainer listContainer,
final LangPanel langPanel) {
+ public LangForm(String id, final WebMarkupContainer listContainer,
+ final LangPanel langPanel) {
super(id);
- this.listContainer = listContainer;
- this.langPanel = langPanel;
setOutputMarkupId(true);
FieldLanguageDaoImpl langDao = Application
@@ -101,7 +106,7 @@ public class LangForm extends Form<Void>
}
languages.setChoices(langDao.getLanguages());
target.add(languages);
- //FIXME need to forse update list container
+ // FIXME need to force update list container
target.add(listContainer);
}
}));
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html?rev=1391768&r1=1391767&r2=1391768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
Sat Sep 29 07:54:54 2012
@@ -35,8 +35,8 @@
<td valign="top" class="adminPanelColumnTable">
<form wicket:id="langForm"
style="display: inline;">
<div class="formNewButton"
-
onclick="$('#addLanguage :text').val('');
$('#addLanguage').dialog('open');"><input/></div>
- <div wicket:id="deleteLangBtn"
class="formCancelButton"><input/></div>
+
onclick="$('#addLanguage :text').val('');
$('#addLanguage').dialog('open');"><input type="button" title=""/></div>
+ <div wicket:id="deleteLangBtn"
class="formCancelButton"><input type="button" title=""/></div>
<select
wicket:id="language"></select>
</form>
<span wicket:id="navigator">[dataview
navigator]</span>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1391768&r1=1391767&r2=1391768&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Sat Sep 29 07:54:54 2012
@@ -47,6 +47,7 @@ public class LangPanel extends AdminPane
private static final long serialVersionUID = 5904180813198016592L;
FieldLanguage language;
+ private LangForm langForm;
public LangPanel(String id) {
super(id);
@@ -105,8 +106,12 @@ public class LangPanel extends AdminPane
target.add(listContainer);
}
});
- add(new LangForm("langForm", listContainer, this));
- add(new AddLanguageForm("addLangForm"));
+ langForm = new LangForm("langForm", listContainer, this);
+ add(langForm);
+ add(new AddLanguageForm("addLangForm", this));
}
+ public LangForm getLangForm() {
+ return langForm;
+ }
}
