Author: solomax
Date: Thu Sep 11 06:53:40 2014
New Revision: 1624210
URL: http://svn.apache.org/r1624210
Log:
[OPENMEETINGS-1055] Invitation dialog is disabled for external users
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Modified:
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1624210&r1=1624209&r2=1624210&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
(original)
+++
openmeetings/branches/3.0.x/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Thu Sep 11 06:53:40 2014
@@ -217,7 +217,7 @@
layout="axis:y;spacing:1" bgcolor="$once{
canvas.getThemeColor('menuBackgroundColor') }" >
<conferencDropDownMenuItem labelid="213"
command="cmd_invitation"
- enabled="${
canvas.timeZonesLoaded && canvas.ismoderator }" />
+ enabled="${
canvas.timeZonesLoaded && !canvas.isRemoteUser() &&
canvas.ismoderator }" />
<horizontalDropDownSpacer />
<conferencDropDownMenuItem labelid="239"
command="cmd_shareDesktop"
enabled="${
classroot.btnRef.classroot.viewType != 'interview' &&
canvas.ismoderator }" />
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java?rev=1624210&r1=1624209&r2=1624210&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/RoomMenuItem.java
Thu Sep 11 06:53:40 2014
@@ -25,11 +25,16 @@ public class RoomMenuItem extends MenuIt
private static final long serialVersionUID = 1L;
public RoomMenuItem(String name) {
- super(name);
+ this(name, null);
}
public RoomMenuItem(String name, String desc) {
+ this(name, desc, true);
+ }
+
+ public RoomMenuItem(String name, String desc, boolean active) {
super(name, desc);
+ this.active = active;
}
public RoomMenuItem(String name, String desc, String cssClass) {
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java?rev=1624210&r1=1624209&r2=1624210&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
Thu Sep 11 06:53:40 2014
@@ -141,18 +141,12 @@ public class RoomPanel extends BasePanel
startSharing.respond(target);
}
};
- applyModer = new RoomMenuItem(WebSession.getString(784),
WebSession.getString(1481));
- applyModer.setActive(false);
- applyWB = new RoomMenuItem(WebSession.getString(785),
WebSession.getString(1492));
- applyWB.setActive(false);
- applyAV = new RoomMenuItem(WebSession.getString(786),
WebSession.getString(1482));
- applyAV.setActive(false);
- pollVote = new RoomMenuItem(WebSession.getString(42),
WebSession.getString(1485));
- pollVote.setActive(false);
- pollResult = new RoomMenuItem(WebSession.getString(37),
WebSession.getString(1484));
- pollResult.setActive(false);
- sipDialer = new RoomMenuItem(WebSession.getString(1447),
WebSession.getString(1488));
- sipDialer.setActive(false);
+ applyModer = new RoomMenuItem(WebSession.getString(784),
WebSession.getString(1481), false);
+ applyWB = new RoomMenuItem(WebSession.getString(785),
WebSession.getString(1492), false);
+ applyAV = new RoomMenuItem(WebSession.getString(786),
WebSession.getString(1482), false);
+ pollVote = new RoomMenuItem(WebSession.getString(42),
WebSession.getString(1485), false);
+ pollResult = new RoomMenuItem(WebSession.getString(37),
WebSession.getString(1484), false);
+ sipDialer = new RoomMenuItem(WebSession.getString(1447),
WebSession.getString(1488), false);
add((menuPanel = new MenuPanel("roomMenu",
getMenu())).setVisible(!r.getHideTopBar()));
WebMarkupContainer wb = new WebMarkupContainer("whiteboard");
add(wb.setOutputMarkupId(true));
@@ -335,7 +329,8 @@ public class RoomPanel extends BasePanel
}
};
User u = getBean(UserDao.class).get(getUserId());
- exit.setActive(u.getType() != User.Type.external && u.getType()
!= User.Type.contact);
+ boolean externalUser = u.getType() == User.Type.external ||
u.getType() == User.Type.contact; //TODO check this
+ exit.setActive(!externalUser);
menu.add(exit);//TODO check this
MenuItem files = new RoomMenuItem(WebSession.getString(245));
List<RoomMenuItem> fileItems = new ArrayList<RoomMenuItem>();
@@ -345,7 +340,7 @@ public class RoomPanel extends BasePanel
MenuItem actions = new RoomMenuItem(WebSession.getString(635));
List<RoomMenuItem> actionItems = new ArrayList<RoomMenuItem>();
- actionItems.add(new RoomMenuItem(WebSession.getString(213),
WebSession.getString(1489)) {
+ actionItems.add(new RoomMenuItem(WebSession.getString(213),
WebSession.getString(1489), !externalUser) {
private static final long serialVersionUID = 1L;
@Override
