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 2017/03/24 14:17:32 UTC
svn commit: r1788456 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/
branches/3.2.x/o...
Author: solomax
Date: Fri Mar 24 14:17:32 2017
New Revision: 1788456
URL: http://svn.apache.org/viewvc?rev=1788456&view=rev
Log:
[OPENMEETINGS-1611] js errors should be fixed
Removed:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/room.js
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/room.js
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Fri Mar 24 14:17:32 2017
@@ -54,7 +54,7 @@ public class ConfigForm extends AdminBas
private void refresh(AjaxRequestTarget target) {
target.add(this);
- target.appendJavaScript("omConfigPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
public ConfigForm(String id, WebMarkupContainer listContainer, Configuration configuration) {
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Fri Mar 24 14:17:32 2017
@@ -65,7 +65,7 @@ public class ConfigsPanel extends AdminP
form.hideNewRecord();
form.setModelObject(c);
target.add(form, listContainer);
- target.appendJavaScript("omConfigPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(c.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Fri Mar 24 14:17:32 2017
@@ -76,14 +76,14 @@ public class LdapForm extends AdminBaseF
setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
target.add(this, listContainer);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new LdapConfig());
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -96,7 +96,7 @@ public class LdapForm extends AdminBaseF
}
this.setModelObject(ldapConfig);
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -105,7 +105,7 @@ public class LdapForm extends AdminBaseF
this.setModelObject(new LdapConfig());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Mar 24 14:17:32 2017
@@ -64,7 +64,7 @@ public class LdapsPanel extends AdminPan
form.setModelObject(lc);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(lc.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java Fri Mar 24 14:17:32 2017
@@ -86,14 +86,14 @@ public class OAuthForm extends AdminBase
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new OAuthServer());
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -106,7 +106,7 @@ public class OAuthForm extends AdminBase
}
this.setModelObject(server);
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -115,7 +115,7 @@ public class OAuthForm extends AdminBase
this.setModelObject(new OAuthServer());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Fri Mar 24 14:17:32 2017
@@ -58,7 +58,7 @@ public class OAuthPanel extends AdminPan
form.setModelObject(server);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Fri Mar 24 14:17:32 2017
@@ -401,7 +401,7 @@ public class RoomForm extends AdminBaseF
target.add(roomList);
target.add(pin.setEnabled(getModelObject().isSipEnabled()));
updateClients(target);
- target.appendJavaScript("omRoomPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Fri Mar 24 14:17:32 2017
@@ -32,17 +32,13 @@ import org.apache.wicket.AttributeModifi
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
public class RoomsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
- private final static JavaScriptResourceReference ROOM_FUNCTIONS = new JavaScriptResourceReference(RoomsPanel.class, "room.js");
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
@@ -67,7 +63,7 @@ public class RoomsPanel extends AdminPan
form.setModelObject(getBean(RoomDao.class).get(roomId));
form.updateView(target);
target.add(form, listContainer);
- target.appendJavaScript("omRoomPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId())));
@@ -92,10 +88,4 @@ public class RoomsPanel extends AdminPan
add(form = new RoomForm("form", listContainer, new Room()));
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(ROOM_FUNCTIONS));
- }
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java Fri Mar 24 14:17:32 2017
@@ -83,7 +83,7 @@ public class ServerForm extends AdminBas
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -93,7 +93,7 @@ public class ServerForm extends AdminBas
s.setProtocol("http");
setModelObject(s);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -106,7 +106,7 @@ public class ServerForm extends AdminBas
}
setModelObject(server);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -115,7 +115,7 @@ public class ServerForm extends AdminBas
this.setModelObject(new Server());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Fri Mar 24 14:17:32 2017
@@ -64,7 +64,7 @@ public class ServersPanel extends AdminP
form.setModelObject(server);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Fri Mar 24 14:17:32 2017
@@ -133,7 +133,7 @@ public class UserForm extends AdminBaseF
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("omUserPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
if (u.getGroupUsers().isEmpty()) {
warning.open(target);
}
@@ -273,7 +273,7 @@ public class UserForm extends AdminBaseF
updateDomain(target);
if (target != null) {
target.add(this, listContainer);
- target.appendJavaScript("omUserPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java Fri Mar 24 14:17:32 2017
@@ -54,7 +54,7 @@ public class ConfigForm extends AdminBas
private void refresh(AjaxRequestTarget target) {
target.add(this);
- target.appendJavaScript("omConfigPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
public ConfigForm(String id, WebMarkupContainer listContainer, Configuration configuration) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Fri Mar 24 14:17:32 2017
@@ -65,7 +65,7 @@ public class ConfigsPanel extends AdminP
form.hideNewRecord();
form.setModelObject(c);
target.add(form, listContainer);
- target.appendJavaScript("omConfigPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(c.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java Fri Mar 24 14:17:32 2017
@@ -76,14 +76,14 @@ public class LdapForm extends AdminBaseF
setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
target.add(this, listContainer);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new LdapConfig());
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -96,7 +96,7 @@ public class LdapForm extends AdminBaseF
}
this.setModelObject(ldapConfig);
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -105,7 +105,7 @@ public class LdapForm extends AdminBaseF
this.setModelObject(new LdapConfig());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Fri Mar 24 14:17:32 2017
@@ -64,7 +64,7 @@ public class LdapsPanel extends AdminPan
form.setModelObject(lc);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("omLdapPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(lc.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java Fri Mar 24 14:17:32 2017
@@ -86,14 +86,14 @@ public class OAuthForm extends AdminBase
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
protected void onNewSubmit(AjaxRequestTarget target, Form<?> form) {
this.setModelObject(new OAuthServer());
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -106,7 +106,7 @@ public class OAuthForm extends AdminBase
}
this.setModelObject(server);
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -115,7 +115,7 @@ public class OAuthForm extends AdminBase
this.setModelObject(new OAuthServer());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Fri Mar 24 14:17:32 2017
@@ -58,7 +58,7 @@ public class OAuthPanel extends AdminPan
form.setModelObject(server);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("oauthPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java Fri Mar 24 14:17:32 2017
@@ -401,7 +401,7 @@ public class RoomForm extends AdminBaseF
target.add(roomList);
target.add(pin.setEnabled(getModelObject().isSipEnabled()));
updateClients(target);
- target.appendJavaScript("omRoomPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Fri Mar 24 14:17:32 2017
@@ -32,17 +32,13 @@ import org.apache.wicket.AttributeModifi
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
public class RoomsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
- private final static JavaScriptResourceReference ROOM_FUNCTIONS = new JavaScriptResourceReference(RoomsPanel.class, "room.js");
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
@@ -67,7 +63,7 @@ public class RoomsPanel extends AdminPan
form.setModelObject(getBean(RoomDao.class).get(roomId));
form.updateView(target);
target.add(form, listContainer);
- target.appendJavaScript("omRoomPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(room.getId(), form.getModelObject().getId())));
@@ -92,10 +88,4 @@ public class RoomsPanel extends AdminPan
add(form = new RoomForm("form", listContainer, new Room()));
}
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(ROOM_FUNCTIONS));
- }
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServerForm.java Fri Mar 24 14:17:32 2017
@@ -83,7 +83,7 @@ public class ServerForm extends AdminBas
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -93,7 +93,7 @@ public class ServerForm extends AdminBas
s.setProtocol("http");
setModelObject(s);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -106,7 +106,7 @@ public class ServerForm extends AdminBas
}
setModelObject(server);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
@@ -115,7 +115,7 @@ public class ServerForm extends AdminBas
this.setModelObject(new Server());
target.add(listContainer);
target.add(this);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
@Override
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Fri Mar 24 14:17:32 2017
@@ -64,7 +64,7 @@ public class ServersPanel extends AdminP
form.setModelObject(server);
form.hideNewRecord();
target.add(form, listContainer);
- target.appendJavaScript("omServerPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
});
item.add(AttributeModifier.replace("class", getRowClass(server.getId(), form.getModelObject().getId())));
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java?rev=1788456&r1=1788455&r2=1788456&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java Fri Mar 24 14:17:32 2017
@@ -133,7 +133,7 @@ public class UserForm extends AdminBaseF
hideNewRecord();
target.add(this);
target.add(listContainer);
- target.appendJavaScript("omUserPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
if (u.getGroupUsers().isEmpty()) {
warning.open(target);
}
@@ -273,7 +273,7 @@ public class UserForm extends AdminBaseF
updateDomain(target);
if (target != null) {
target.add(this, listContainer);
- target.appendJavaScript("omUserPanelInit();");
+ target.appendJavaScript("adminPanelInit();");
}
}