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 2016/11/17 15:30:23 UTC
svn commit: r1770215 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
trunk/openmeetings-web/src/main/jav...
Author: solomax
Date: Thu Nov 17 15:30:23 2016
New Revision: 1770215
URL: http://svn.apache.org/viewvc?rev=1770215&view=rev
Log:
no jira: JS error are fixed
Added:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1770215&r1=1770214&r2=1770215&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Thu Nov 17 15:30:23 2016
@@ -45,7 +45,6 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -66,7 +65,6 @@ import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
import com.googlecode.wicket.kendo.ui.form.datetime.local.AjaxDatePicker;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
@@ -217,6 +215,6 @@ public class GeneralUserForm extends For
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(WebSession.get().getLocale())));
+ response.render(KendoCultureHeaderItem.get());
}
}
Added: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java?rev=1770215&view=auto
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java (added)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java Thu Nov 17 15:30:23 2016
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.common;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import com.googlecode.wicket.kendo.ui.KendoCulture;
+import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
+
+public class KendoCultureHeaderItem {
+ private static Set<String> CULTURES = new HashSet<>();
+
+ public static JavaScriptHeaderItem get() {
+ if (CULTURES.isEmpty()) {
+ for (KendoCulture c : KendoCulture.values()) {
+ CULTURES.add(c.toString());
+ }
+ }
+ Locale l = WebSession.get().getLocale();
+ String culture = l.toLanguageTag();
+ if (!CULTURES.contains(culture)) {
+ culture = l.getLanguage();
+ if (!CULTURES.contains(culture)) {
+ culture = Locale.ENGLISH.getLanguage();
+ }
+ }
+ return JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(culture));
+ }
+}
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1770215&r1=1770214&r2=1770215&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java Thu Nov 17 15:30:23 2016
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
import org.threeten.bp.LocalDate;
import org.threeten.bp.LocalDateTime;
@@ -32,7 +31,6 @@ import com.googlecode.wicket.jquery.core
import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
public class OmDateTimePicker extends DateTimePicker {
private static final long serialVersionUID = 1L;
@@ -54,6 +52,6 @@ public class OmDateTimePicker extends Da
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(WebSession.get().getLocale())));
+ response.render(KendoCultureHeaderItem.get());
}
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1770215&r1=1770214&r2=1770215&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Thu Nov 17 15:30:23 2016
@@ -45,7 +45,6 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -66,7 +65,6 @@ import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
import com.googlecode.wicket.kendo.ui.form.datetime.local.AjaxDatePicker;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
@@ -83,7 +81,7 @@ public class GeneralUserForm extends For
//TODO should throw exception if non admin User edit somebody else (or make all fields read-only)
add(passwordField = new PasswordTextField("password", new Model<String>()));
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- passwordField.setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
+ passwordField.setResetPassword(false).setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
updateModelObject(getModelObject(), isAdminForm);
add(new DropDownChoice<Salutation>("salutation"
@@ -217,6 +215,6 @@ public class GeneralUserForm extends For
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(WebSession.get().getLocale())));
+ response.render(KendoCultureHeaderItem.get());
}
}
Added: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java?rev=1770215&view=auto
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java (added)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java Thu Nov 17 15:30:23 2016
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.common;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import com.googlecode.wicket.kendo.ui.KendoCulture;
+import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
+
+public class KendoCultureHeaderItem {
+ private static Set<String> CULTURES = new HashSet<>();
+
+ public static JavaScriptHeaderItem get() {
+ if (CULTURES.isEmpty()) {
+ for (KendoCulture c : KendoCulture.values()) {
+ CULTURES.add(c.toString());
+ }
+ }
+ Locale l = WebSession.get().getLocale();
+ String culture = l.toLanguageTag();
+ if (!CULTURES.contains(culture)) {
+ culture = l.getLanguage();
+ if (!CULTURES.contains(culture)) {
+ culture = Locale.ENGLISH.getLanguage();
+ }
+ }
+ return JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(culture));
+ }
+}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1770215&r1=1770214&r2=1770215&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java Thu Nov 17 15:30:23 2016
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
import org.threeten.bp.LocalDate;
import org.threeten.bp.LocalDateTime;
@@ -32,7 +31,6 @@ import com.googlecode.wicket.jquery.core
import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
public class OmDateTimePicker extends DateTimePicker {
private static final long serialVersionUID = 1L;
@@ -54,6 +52,6 @@ public class OmDateTimePicker extends Da
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(WebSession.get().getLocale())));
+ response.render(KendoCultureHeaderItem.get());
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1770215&r1=1770214&r2=1770215&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Thu Nov 17 15:30:23 2016
@@ -45,7 +45,6 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -66,7 +65,6 @@ import org.wicketstuff.select2.Response;
import org.wicketstuff.select2.Select2MultiChoice;
import com.googlecode.wicket.kendo.ui.form.datetime.local.AjaxDatePicker;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
@@ -217,6 +215,6 @@ public class GeneralUserForm extends For
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(WebSession.get().getLocale())));
+ response.render(KendoCultureHeaderItem.get());
}
}
Added: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java?rev=1770215&view=auto
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java (added)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/KendoCultureHeaderItem.java Thu Nov 17 15:30:23 2016
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.common;
+
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.apache.openmeetings.web.app.WebSession;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import com.googlecode.wicket.kendo.ui.KendoCulture;
+import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
+
+public class KendoCultureHeaderItem {
+ private static Set<String> CULTURES = new HashSet<>();
+
+ public static JavaScriptHeaderItem get() {
+ if (CULTURES.isEmpty()) {
+ for (KendoCulture c : KendoCulture.values()) {
+ CULTURES.add(c.toString());
+ }
+ }
+ Locale l = WebSession.get().getLocale();
+ String culture = l.toLanguageTag();
+ if (!CULTURES.contains(culture)) {
+ culture = l.getLanguage();
+ if (!CULTURES.contains(culture)) {
+ culture = Locale.ENGLISH.getLanguage();
+ }
+ }
+ return JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(culture));
+ }
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java?rev=1770215&r1=1770214&r2=1770215&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmDateTimePicker.java Thu Nov 17 15:30:23 2016
@@ -22,7 +22,6 @@ import java.util.Locale;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
import org.threeten.bp.LocalDate;
import org.threeten.bp.LocalDateTime;
@@ -32,7 +31,6 @@ import com.googlecode.wicket.jquery.core
import com.googlecode.wicket.kendo.ui.form.datetime.local.DatePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.DateTimePicker;
import com.googlecode.wicket.kendo.ui.form.datetime.local.TimePicker;
-import com.googlecode.wicket.kendo.ui.resource.KendoCultureResourceReference;
public class OmDateTimePicker extends DateTimePicker {
private static final long serialVersionUID = 1L;
@@ -54,6 +52,6 @@ public class OmDateTimePicker extends Da
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new KendoCultureResourceReference(WebSession.get().getLocale())));
+ response.render(KendoCultureHeaderItem.get());
}
}