Author: solomax
Date: Thu May 19 12:06:55 2016
New Revision: 1744556
URL: http://svn.apache.org/viewvc?rev=1744556&view=rev
Log:
[OPENMEETINGS-1406] view profile form is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
Thu May 19 12:06:55 2016
@@ -72,7 +72,7 @@
</tr>
<tr>
<td><wicket:message key="141"
/></td>
- <td><span
wicket:id="address.state.name"></span></td>
+ <td><span
wicket:id="country"></span></td>
</tr>
<tr>
<td><wicket:message key="142"
/></td>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Thu May 19 12:06:55 2016
@@ -27,6 +27,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
@@ -60,7 +61,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("address.state.name"));
+ address.add(new Label("country",
CountryDropDown.getCountryName(model.getObject().getAddress().getCountry())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Thu May 19 12:06:55 2016
@@ -34,6 +34,10 @@ public class CountryDropDown extends Dro
this(id, null);
}
+ public static String getCountryName(String code) {
+ return new
Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale());
+ }
+
public CountryDropDown(String id, IModel<String> model) {
super(id, model, Arrays.asList(Locale.getISOCountries()));
setChoiceRenderer(new IChoiceRenderer<String>() {
@@ -46,7 +50,7 @@ public class CountryDropDown extends Dro
@Override
public Object getDisplayValue(String code) {
- return new
Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale());
+ return getCountryName(code);
}
@Override
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
Thu May 19 12:06:55 2016
@@ -72,7 +72,7 @@
</tr>
<tr>
<td><wicket:message key="141"
/></td>
- <td><span
wicket:id="address.state.name"></span></td>
+ <td><span
wicket:id="country"></span></td>
</tr>
<tr>
<td><wicket:message key="142"
/></td>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Thu May 19 12:06:55 2016
@@ -27,6 +27,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
@@ -60,7 +61,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("address.state.name"));
+ address.add(new Label("country",
CountryDropDown.getCountryName(model.getObject().getAddress().getCountry())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Thu May 19 12:06:55 2016
@@ -34,6 +34,10 @@ public class CountryDropDown extends Dro
this(id, null);
}
+ public static String getCountryName(String code) {
+ return new
Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale());
+ }
+
public CountryDropDown(String id, IModel<String> model) {
super(id, model, Arrays.asList(Locale.getISOCountries()));
setChoiceRenderer(new IChoiceRenderer<String>() {
@@ -46,7 +50,7 @@ public class CountryDropDown extends Dro
@Override
public Object getDisplayValue(String code) {
- return new
Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale());
+ return getCountryName(code);
}
@Override
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
Thu May 19 12:06:55 2016
@@ -72,7 +72,7 @@
</tr>
<tr>
<td><wicket:message key="141"
/></td>
- <td><span
wicket:id="address.state.name"></span></td>
+ <td><span
wicket:id="country"></span></td>
</tr>
<tr>
<td><wicket:message key="142"
/></td>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
Thu May 19 12:06:55 2016
@@ -27,6 +27,7 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
+import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.TextArea;
@@ -60,7 +61,7 @@ public class UserProfilePanel extends Us
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("address.state.name"));
+ address.add(new Label("country",
CountryDropDown.getCountryName(model.getObject().getAddress().getCountry())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java?rev=1744556&r1=1744555&r2=1744556&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/CountryDropDown.java
Thu May 19 12:06:55 2016
@@ -34,6 +34,10 @@ public class CountryDropDown extends Dro
this(id, null);
}
+ public static String getCountryName(String code) {
+ return new
Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale());
+ }
+
public CountryDropDown(String id, IModel<String> model) {
super(id, model, Arrays.asList(Locale.getISOCountries()));
setChoiceRenderer(new IChoiceRenderer<String>() {
@@ -46,7 +50,7 @@ public class CountryDropDown extends Dro
@Override
public Object getDisplayValue(String code) {
- return new
Locale.Builder().setRegion(code).build().getDisplayCountry(WebSession.get().getLocale());
+ return getCountryName(code);
}
@Override
