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/09/25 18:48:26 UTC
svn commit: r1526229 - in
/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web:
admin/users/ user/profile/
Author: solomax
Date: Wed Sep 25 16:48:26 2013
New Revision: 1526229
URL: http://svn.apache.org/r1526229
Log:
User type and ownerId are added to the admin form;
Wicket warnings are fixed
Added:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
Added: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html?rev=1526229&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html (added)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html Wed Sep 25 16:48:26 2013
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <div wicket:id="buttons"></div>
+ <div class="scrollcontent" id="adminForm">
+ <fieldset>
+ <legend>
+ <wicket:ommessage key="143" />
+ </legend>
+ <div class="formelement">
+ <label><wicket:ommessage key="132" /></label><input type="text" wicket:id="login" />
+ </div>
+ <form wicket:id="general"></form>
+ <div class="formelement">
+ <label><wicket:ommessage key="45" /></label><select wicket:id="type"></select>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1308" /></label><span wicket:id="ownerId"></span>
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1110" /></label><span wicket:id="starttime" />
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="1112" /></label><span wicket:id="updatetime" />
+ </div>
+ <div class="formelement">
+ <div class="info-text">
+ <wicket:ommessage key="1149" />
+ </div>
+ <br /> <label><wicket:ommessage key="1148" /></label><input class="formcheckbox" type="checkbox"
+ wicket:id="forceTimeZoneCheck" />
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="158" /></label><select wicket:id="status" />
+ </div>
+ <div class="formelement">
+ <label><wicket:ommessage key="169" /></label><select wicket:id="level_id" />
+ </div>
+ </fieldset>
+ <fieldset>
+ <legend>
+ <wicket:ommessage key="1159" />
+ </legend>
+ <form wicket:id="comunity"></form>
+ </fieldset>
+ </div>
+</wicket:panel>
+</html>
\ No newline at end of file
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1526229&r1=1526228&r2=1526229&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Wed Sep 25 16:48:26 2013
@@ -30,6 +30,7 @@ import java.util.Arrays;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.AdminUserDao;
import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ComunityUserForm;
@@ -37,11 +38,14 @@ import org.apache.openmeetings.web.commo
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.form.RequiredTextField;
+import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
+import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.time.Duration;
@@ -134,6 +138,8 @@ public class UserForm extends AdminBaseF
add(generalForm = new GeneralUserForm("general", getModel(), true));
+ add(new DropDownChoice<Type>("type", Arrays.asList(Type.values())));
+ add(new Label("ownerId"));
add(forDatePattern("starttime", WEB_DATE_PATTERN));
add(forDatePattern("updatetime", WEB_DATE_PATTERN));
@@ -219,4 +225,9 @@ public class UserForm extends AdminBaseF
//ignore validation errors
onDeleteSubmit(target, form);
}
+
+ @Override
+ protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
+ return new PanelMarkupSourcingStrategy(false);
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html?rev=1526229&r1=1526228&r2=1526229&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html Wed Sep 25 16:48:26 2013
@@ -72,49 +72,7 @@
</div>
</div>
<div class="adminPanelColumnForm">
- <form wicket:id="form" class="adminForm">
- <div wicket:id="buttons"></div>
- <div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend>
- <wicket:ommessage key="143" />
- </legend>
- <div class="formelement">
- <label><wicket:ommessage key="132" /></label><input type="text"
- wicket:id="login" />
- </div>
- <form wicket:id="general"></form>
- <div class="formelement">
- <label><wicket:ommessage key="1110" /></label><span
- wicket:id="starttime" />
- </div>
- <div class="formelement">
- <label><wicket:ommessage key="1112" /></label><span
- wicket:id="updatetime" />
- </div>
- <div class="formelement">
- <div class="info-text"><wicket:ommessage
- key="1149" /></div> <br /> <label><wicket:ommessage
- key="1148" /></label><input class="formcheckbox" type="checkbox"
- wicket:id="forceTimeZoneCheck" />
- </div>
- <div class="formelement">
- <label><wicket:ommessage key="158" /></label><select
- wicket:id="status" />
- </div>
- <div class="formelement">
- <label><wicket:ommessage key="169" /></label><select
- wicket:id="level_id" />
- </div>
- </fieldset>
- <fieldset>
- <legend>
- <wicket:ommessage key="1159" />
- </legend>
- <form wicket:id="comunity"></form>
- </fieldset>
- </div>
- </form>
+ <form wicket:id="form" class="adminForm"/>
</div>
</div>
<div wicket:id="warning"></div>
Added: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html?rev=1526229&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html (added)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html Wed Sep 25 16:48:26 2013
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <div wicket:id="buttons"></div>
+ <table style="width: 100%; height: 100%">
+ <tr>
+ <td rowspan="2">
+ <fieldset>
+ <legend>
+ <wicket:ommessage key="143" />
+ </legend>
+ <form wicket:id="general"></form>
+ </fieldset>
+ </td>
+ <td>
+ <div wicket:id="img"></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <fieldset>
+ <legend>
+ <wicket:ommessage key="1159" />
+ </legend>
+ <form wicket:id="comunity"></form>
+ </fieldset>
+ </td>
+ </tr>
+ </table>
+</wicket:panel>
+</html>
Added: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java?rev=1526229&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java (added)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java Wed Sep 25 16:48:26 2013
@@ -0,0 +1,94 @@
+/*
+ * 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.user.profile;
+
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.db.entity.user.User;
+import org.apache.openmeetings.web.common.ComunityUserForm;
+import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
+import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
+import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.util.time.Duration;
+
+public class ProfileForm extends Form<User> {
+ private static final long serialVersionUID = 1L;
+ private final UserForm userForm;
+
+ public ProfileForm(String id) {
+ super(id, new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId())));
+
+ add(new FormSaveRefreshPanel<User>("buttons", this) {
+ private static final long serialVersionUID = 6578425915881674309L;
+
+ @Override
+ protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
+ User u = getModelObject();
+ try {
+ u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
+ } catch (Exception e) {
+ // FIXME update feedback with the error details
+ }
+ setModelObject(u);
+ target.add(ProfileForm.this);
+ }
+
+ @Override
+ protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
+ // FIXME update feedback with the error details
+ }
+
+ @Override
+ protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
+ User user = getModelObject();
+ if (user.getUser_id() != null) {
+ user = getBean(UserDao.class).get(user.getUser_id());
+ } else {
+ user = new User();
+ }
+ setModelObject(user);
+ target.add(ProfileForm.this);
+ }
+
+ @Override
+ protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
+ // FIXME update feedback with the error details
+ }
+ });
+ add(userForm = new UserForm("general", getModel()));
+ add(new UploadableProfileImagePanel("img", getUserId()));
+ add(new ComunityUserForm("comunity", getModel()));
+
+ // attach an ajax validation behavior to all form component's keydown
+ // event and throttle it down to once per second
+ AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
+ }
+
+ @Override
+ protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
+ return new PanelMarkupSourcingStrategy(false);
+ }
+}
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html?rev=1526229&r1=1526228&r2=1526229&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html Wed Sep 25 16:48:26 2013
@@ -20,33 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <form wicket:id="form" class="adminForm">
- <div wicket:id="buttons"></div>
- <table style="width: 100%; height: 100%">
- <tr>
- <td rowspan="2">
- <fieldset>
- <legend>
- <wicket:ommessage key="143" />
- </legend>
- <form wicket:id="general"></form>
- </fieldset>
- </td>
- <td>
- <div wicket:id="img"></div>
- </td>
- </tr>
- <tr>
- <td>
- <fieldset>
- <legend>
- <wicket:ommessage key="1159" />
- </legend>
- <form wicket:id="comunity"></form>
- </fieldset>
- </td>
- </tr>
- </table>
- </form>
+ <form wicket:id="form" class="adminForm"/>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java?rev=1526229&r1=1526228&r2=1526229&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java Wed Sep 25 16:48:26 2013
@@ -18,20 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
-import static org.apache.openmeetings.web.app.Application.getBean;
-import static org.apache.openmeetings.web.app.WebSession.getUserId;
-
-import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.common.ComunityUserForm;
-import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
-import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
import org.apache.openmeetings.web.common.UserPanel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.util.time.Duration;
public class ProfilePanel extends UserPanel {
private static final long serialVersionUID = -5837090230776586182L;
@@ -40,57 +27,6 @@ public class ProfilePanel extends UserPa
super(id);
setOutputMarkupId(true);
- Form<User> form = new Form<User>("form", new CompoundPropertyModel<User>(getBean(UserDao.class).get(getUserId()))) {
- private static final long serialVersionUID = -4968428244553170528L;
- private final UserForm userForm;
-
- {
- add(new FormSaveRefreshPanel<User>("buttons", this) {
- private static final long serialVersionUID = 6578425915881674309L;
-
- @Override
- protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
- User u = getModelObject();
- try {
- u = getBean(UserDao.class).update(u, userForm.getPasswordField().getConvertedInput(), getUserId());
- } catch (Exception e) {
- // FIXME update feedback with the error details
- }
- setModelObject(u);
- target.add(ProfilePanel.this);
- }
-
- @Override
- protected void onSaveError(AjaxRequestTarget target, Form<?> form) {
- // FIXME update feedback with the error details
- }
-
- @Override
- protected void onRefreshSubmit(AjaxRequestTarget target, Form<?> form) {
- User user = getModelObject();
- if (user.getUser_id() != null) {
- user = getBean(UserDao.class).get(user.getUser_id());
- } else {
- user = new User();
- }
- setModelObject(user);
- target.add(ProfilePanel.this);
- }
-
- @Override
- protected void onRefreshError(AjaxRequestTarget target, Form<?> form) {
- // FIXME update feedback with the error details
- }
- });
- add(userForm = new UserForm("general", getModel()));
- add(new UploadableProfileImagePanel("img", getUserId()));
- add(new ComunityUserForm("comunity", getModel()));
-
- // attach an ajax validation behavior to all form component's keydown
- // event and throttle it down to once per second
- AjaxFormValidatingBehavior.addToAllFormComponents(this, "keydown", Duration.ONE_SECOND);
- }
- };
- add(form);
+ add(new ProfileForm("form"));
}
}