Author: solomax
Date: Thu Jul 19 05:29:18 2012
New Revision: 1363219
URL: http://svn.apache.org/viewvc?rev=1363219&view=rev
Log:
OPENMEETINGS-357 is implemented
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/functions.lzx
Thu Jul 19 05:29:18 2012
@@ -95,13 +95,9 @@ function getLabelTag(labelid){
return l;
}
-function quicklink(action){
- quicklinkAct(action);
-}
-
-function quicklinkAct(action){
+function quicklinkAct(action) {
// if($debug) Debug.write("FUNC/quicklinkAct",action);
- loadContent({action: action},null,null);
+ loadContent({action: action, params: null},null,null);
}
function loadContent(obj,parentobj,preparentobj){
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
Thu Jul 19 05:29:18 2012
@@ -95,6 +95,9 @@
<!--- the current Invitation-Object -->
<attribute name="currentInvitation" value="null" />
+ <!--- the current Dashboard config -->
+ <attribute name="dashboardConfig" value="null" />
+
<!-- shows what kind of conferenceView it is at the moment
wether its conferenceView or audienceView -->
<attribute name="modus" value="" type="string" />
@@ -912,10 +915,24 @@
if (canvas.thishib.loaderVar != null) {
canvas.thishib.loaderVar.setProgress();
}
- parent.getNavi.doCall();
+ parent.getDashboardConfiguration.doCall();
</handler>
</netRemoteCallHib>
+ <netRemoteCallHib name="getDashboardConfiguration"
funcname="xmlcrm.getDashboardConfiguration" remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug)
Debug.write("getDashboardConfiguration: ", value);
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
+ parent.dashboardConfig = value;
+ parent.getNavi.doCall();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
<netRemoteCallHib name="testMethod" funcname="testMethod">
<handler name="ondata" args="value">
//The onResult-Handler will be called be the rtmpconnection
@@ -923,32 +940,6 @@
</handler>
</netRemoteCallHib>
- <!---
- this remotecall is quite important as only at this point you can
decide which
- position a newly connected user has => this comment is deprecated!
swagner 10.08.2009
-
- currentuserpos => is no more important
-
- <netRemoteCallHib name="setAudienceModus" funcname="setAudienceModus">
- <netparam><method name="getValue">return
canvas.currentusercolor;</method></netparam>
- <netparam><method name="getValue">return
canvas.currentuserpos;</method></netparam>
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setAudienceModus: ",value);
- </handler>
- </netRemoteCallHib>
-
- Notification of new User
- <netRemoteCallHib name="setAudienceModusClient"
funcname="setAudienceModusClient">
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- if ($debug) Debug.write("setAudienceModusClient: ",value);
-
canvas._videocontainer.addClientItem(value.connectedSince,value.isMod,value.streamid,value.room_id,'',value.formatedDate,value.userpos,value.usercolor,value);
-
canvas.setAttribute('numberofpartners',canvas.getAttribute('numberofpartners')+1);
- </handler>
- </netRemoteCallHib>
- -->
-
<!--- Notification of new User -->
<netRemoteCallHib name="addNewUser" funcname="addNewUser">
<handler name="ondata" args="value">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Thu Jul 19 05:29:18 2012
@@ -448,7 +448,7 @@
new lz.sipDialer(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
- quicklink('conferenceModuleRoomList')
+ quicklinkAct('conferenceModuleRoomList')
} else if( stringSub == "browser_open" ){
var browserPanelWidth = canvas.browserPanelWidth;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
Thu Jul 19 05:29:18 2012
@@ -263,7 +263,7 @@
<handler name="oninit">
<![CDATA[
var value = this.naviObject;
- for (var i=0;i<value.length;i++){
+ for (var i = 0; i < value.length; ++i) {
var t1 = new lz.mainMenuMeetingsItem(this.itemlist,{
textvalue:value[i].name,
list:value[i].mainnavi,
@@ -272,15 +272,47 @@
textToolTip:value[i].tooltip.value,
action:value[i].action
});
-
- if (canvas.cuser == "") {
- if (i==0) {
- quicklinkAct(value[i].mainnavi[0].action);
- }
- }
}
- if (canvas.cuser != "") {
+ if (canvas.cuser == "") {
+ var opened = false;
+ for (var i = 0; i <
canvas.thishib.dashboardConfig.length; ++i) {
+ var cfg =
canvas.thishib.dashboardConfig[i];
+ if (cfg.conf_key ==
"default.landing.zone") {
+ switch (cfg.conf_value) {
+ case "dashboard.rooms":
+
loadContent({action: "dashboardModuleStartScreen", params: "myRoomsTabButton"});
+ opened = true;
+ break;
+ case "dashboard.chat":
+
loadContent({action: "dashboardModuleStartScreen", params: "chatTabButton"});
+ opened = true;
+ break;
+ case "calendar":
+
quicklinkAct("dashboardModuleCalendar");
+ opened = true;
+ break;
+ case "rooms.public":
+
loadContent({action: "conferenceModuleRoomList", params: "publicTabButton"});
+ opened = true;
+ break;
+ case "rooms.private":
+
loadContent({action: "conferenceModuleRoomList", params: "privateTabButton"});
+ opened = true;
+ break;
+ case "rooms.user":
+
loadContent({action: "conferenceModuleRoomList", params: "myTabButton"});
+ opened = true;
+ break;
+ }
+ break;
+ }
+ }
+ if (!opened && value.length) {
+ var navi = value[0].mainnavi[0];
+ loadContent({action: navi.action,
params: navi.params});
+ }
+ } else {
if (canvas.cuserStatus == "yes") {
this.changeUserContactByHash.pending = true;
this.changeUserContactByHash.doCall();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
Thu Jul 19 05:29:18 2012
@@ -44,28 +44,28 @@
<iconStepButtonWizzard resourceViewName="icon_btn_dashboard_1" x="110"
y="30" labelid="768">
<handler name="onclick">
- quicklink('conferenceModuleRoomList');
+ quicklinkAct('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
<iconStepButtonWizzard resourceViewName="icon_btn_dashboard_2" x="140"
y="60" labelid="771">
<handler name="onclick">
- quicklink('conferenceModuleRoomList');
+ quicklinkAct('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
<iconStepButtonWizzard resourceViewName="icon_btn_dashboard_3" x="170"
y="90" labelid="772" >
<handler name="onclick">
- quicklink('conferenceModuleRoomList');
+ quicklinkAct('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
<iconStepButtonWizzard resourceViewName="icon_btn_dashboard_4" x="200"
y="120" labelid="773">
<handler name="onclick">
- quicklink('conferenceModuleRoomList');
+ quicklinkAct('conferenceModuleRoomList');
</handler>
</iconStepButtonWizzard>
@@ -76,7 +76,7 @@
y="$once{ parent.height-70 }" height="24"
onclick="this.parent.storeSettings();">
<handler name="onclick">
- quicklink('conferenceModuleRoomList');
+ quicklinkAct('conferenceModuleRoomList');
</handler>
<labelTooltip labelid="769" />
</simpleLabelButton>
@@ -85,7 +85,7 @@
y="$once{ parent.height-44 }" height="24"
onclick="this.parent.storeSettings();">
<handler name="onclick">
- quicklink('dashboardModuleCalendar');
+ quicklinkAct('dashboardModuleCalendar');
</handler>
<labelTooltip labelid="805" />
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
Thu Jul 19 05:29:18 2012
@@ -30,29 +30,19 @@
<!--- modules:dashboard -->
<class name="mainDashboard" extends="baseContentView">
+ <attribute name="params" value="" type="string" />
<handler name="oninit">
//this.getRssFeeds.doCall();
- this.getDashboardConfiguration.doCall();
+ parseConfiguration(canvas.thishib.dashboardConfig);
_mainScrollBar.setAttribute("visibility","hidden");
</handler>
- <netRemoteCallHib name="getDashboardConfiguration"
funcname="xmlcrm.getDashboardConfiguration"
- remotecontext="$once{ canvas.thishib }" >
- <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
- <handler name="ondata" args="value">
- <![CDATA[
- if ($debug) Debug.write("getDashboardConfiguration: ", value);
- parent.parseConfiguration(value);
- ]]>
- </handler>
- </netRemoteCallHib>
-
<method name="parseConfiguration" args="cfManagementList">
<![CDATA[
var tCountVisibleTabs = 0;
var tFoundVisibleDefaultTab = false;
- for (var i=0;i<cfManagementList.length;i++) {
+ for (var i = 0; i < cfManagementList.length; ++i) {
var tConfigurationObj = cfManagementList[i];
switch (tConfigurationObj.conf_key) {
@@ -79,15 +69,28 @@
}
break;
case "default.dashboard.tab":
- var tIndexNumber =
Number(tConfigurationObj.conf_value);
- var tObj =
this._bottomArea._tabbar.subviews[tIndexNumber];
-
- if ($debug)
Debug.write("tIndexNumber|tObj",tIndexNumber,tObj);
- if (tObj && tObj.visible) {
- tFoundVisibleDefaultTab = true;
- tObj.onclick.sendEvent(null);
+ if (this.params = "") {
+ var tIndexNumber =
Number(tConfigurationObj.conf_value);
+ var tObj =
this._bottomArea._tabbar.subviews[tIndexNumber];
+
+ if ($debug)
Debug.write("tIndexNumber|tObj",tIndexNumber,tObj);
+ if (tObj && tObj.visible) {
+ tFoundVisibleDefaultTab
= true;
+
tObj.onclick.sendEvent(null);
+ }
+ } else {
+ switch (this.params) {
+ case "myRoomsTabButton":
+
_bottomArea.doSelection(_bottomArea._tabbar.myRoomsTabButton);
+ break;
+ case "chatTabButton":
+
_bottomArea.doSelection(_bottomArea._tabbar.chatTabButton);
+ break;
+ }
}
break;
+ case "default.landing.zone":
+ break;
default:
if ($debug) Debug.write("Unkown Tab Key
",tConfigurationObj.conf_key);
break;
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
Thu Jul 19 05:29:18 2012
@@ -23,7 +23,7 @@
<class name="allmeetings" extends="baseContentView" height="${
canvas.height-canvas.naviHeight }">
<attribute name="finishedTabsQuantity" type="number" value="0"/>
<attribute name="clickedButton" value="null"/>
- <attribute name="params" value="" type="string" />
+ <attribute name="params" value="" type="string" />
<method name="updateFinishedTabsQuantity">
this.finishedTabsQuantity = this.finishedTabsQuantity + 1;
@@ -38,19 +38,18 @@
</method>
<handler name="oninit">
- if ($debug) Debug.write("!!! allmeetings::oninit params = ",
this.params, this._tabbar);
_mainScrollBar.setAttribute("visibility","hidden");
- switch (this.params) {
- case "publicTabButton":
- doSelection(this._tabbar.publicTabButton);
- break;
- case "privateTabButton":
- doSelection(this._tabbar.privateTabButton);
- break;
- case "myTabButton":
- doSelection(this._tabbar.myTabButton);
- break;
- }
+ switch (this.params) {
+ case "publicTabButton":
+ doSelection(this._tabbar.publicTabButton);
+ break;
+ case "privateTabButton":
+ doSelection(this._tabbar.privateTabButton);
+ break;
+ case "myTabButton":
+ doSelection(this._tabbar.myTabButton);
+ break;
+ }
</handler>
<handler name="ontabcontentleave">
Modified:
incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
(original)
+++ incubator/openmeetings/trunk/singlewebapp/docs/GeneralConfiguration.html
Thu Jul 19 05:29:18 2012
@@ -752,6 +752,20 @@ limitations under the License.
2.0.x
</td>
</tr>
+ <tr>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ default.landing.zone
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ dashboard.rooms
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ Area to be shown to the user after login. Possible values are:
dashboard.rooms, dashboard.chat, calendar, rooms.public, rooms.private,
rooms.user
+ </td>
+ <td bgcolor="#a0ddf0" colspan="" rowspan=""
valign="top" align="left" style="color: black; font-size: small; font-family:
arial, helvetica, sanserif;">
+ 2.1.x
+ </td>
+ </tr>
</table>
</blockquote>
</td></tr>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Configurationmanagement.java
Thu Jul 19 05:29:18 2012
@@ -19,6 +19,7 @@
package org.openmeetings.app.data.basic;
import java.lang.reflect.Constructor;
+import java.util.Arrays;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -64,12 +65,8 @@ public class Configurationmanagement {
public Configuration getConfKey(long user_level, String CONF_KEY) {
try {
if (authLevelManagement.checkUserLevel(user_level)) {
- TypedQuery<Configuration> query = em
- .createQuery(
- "select c from
Configuration as c where c.conf_key = :conf_key and c.deleted = :deleted",
-
Configuration.class);
+ TypedQuery<Configuration> query =
em.createNamedQuery("getConfigurationByKey", Configuration.class);
query.setParameter("conf_key", CONF_KEY);
- query.setParameter("deleted", "false");
List<Configuration> configs =
query.getResultList();
@@ -85,6 +82,22 @@ public class Configurationmanagement {
return null;
}
+ public List<Configuration> getConfKeys(long user_level, String... keys)
{
+ try {
+ if (authLevelManagement.checkUserLevel(user_level)) {
+ TypedQuery<Configuration> query =
em.createNamedQuery("getConfigurationsByKeys", Configuration.class);
+ query.setParameter("conf_keys",
Arrays.asList(keys));
+
+ return query.getResultList();
+ } else {
+ log.error("[getAllConf] Permission denied " +
user_level);
+ }
+ } catch (Exception ex2) {
+ log.error("[getConfKey]: ", ex2);
+ }
+ return null;
+ }
+
/**
* Return a object using a custom type and a default value if the key
is not present
*
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Thu Jul 19 05:29:18 2012
@@ -140,11 +140,11 @@ public class ImportInitvalues {
true, false, 1, "List of Conference Rooms Main
Navi", 3,
"false", 1506L);
- navimanagement.addMainStructure("conferenceModuleRoomList",
"privateTabButton", 1, 779,
+ navimanagement.addMainStructure("conferenceModuleRoomList",
"privateTabButton", 2, 779,
true, false, 1, "List of Conference Rooms Main
Navi", 3,
"false", 1507L);
- navimanagement.addMainStructure("conferenceModuleRoomList",
"myTabButton", 1, 781,
+ navimanagement.addMainStructure("conferenceModuleRoomList",
"myTabButton", 3, 781,
true, false, 1, "List of Conference Rooms Main
Navi", 3,
"false", 1508L);
/*
@@ -564,6 +564,10 @@ public class ImportInitvalues {
null,
"Set inviter's email address as
ReplyTo in email invitations (1 == set, 0 == NOT set)");
+ cfgManagement.addConfByKey(3, "default.landing.zone",
"dashboard.rooms", null,
+ "Area to be shown to the user after login. Possible
values are: "
+ + "dashboard.rooms, dashboard.chat, calendar,
rooms.public, rooms.private, rooms.user");
+
log.debug("Configuration ADDED");
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/basic/Configuration.java
Thu Jul 19 05:29:18 2012
@@ -30,13 +30,18 @@ import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Lob;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.persistence.Transient;
@Entity
+@NamedQueries({
+ @NamedQuery(name = "getConfigurationByKey", query = "SELECT c FROM
Configuration c WHERE c.conf_key = :conf_key and c.deleted = 'false'")
+ , @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM
Configuration c WHERE c.conf_key IN :conf_keys and c.deleted = 'false'")
+})
@Table(name = "configuration")
public class Configuration implements Serializable {
-
private static final long serialVersionUID = -6129473946508963339L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/remote/MainService.java
Thu Jul 19 05:29:18 2012
@@ -1039,53 +1039,16 @@ public class MainService implements IPen
try {
Long users_id = sessionManagement.checkSession(SID);
Long user_level =
userManagement.getUserLevelByID(users_id);
- if (authLevelManagement.checkUserLevel(user_level)) {
-
- List<Configuration> cfManagementList = new
LinkedList<Configuration>();
-
-
cfManagementList.add(cfgManagement.getConfKey(3L,
- "dashboard.show.chat"));
-
cfManagementList.add(cfgManagement.getConfKey(3L,
- "dashboard.show.myrooms"));
-
cfManagementList.add(cfgManagement.getConfKey(3L,
- "dashboard.show.rssfeed"));
-
cfManagementList.add(cfgManagement.getConfKey(3L,
- "default.dashboard.tab"));
-
- return cfManagementList;
- }
+ return cfgManagement.getConfKeys(user_level, new
String[]{
+ "dashboard.show.chat"
+ , "dashboard.show.myrooms"
+ , "dashboard.show.rssfeed"
+ , "default.dashboard.tab"
+ , "default.landing.zone"
+ });
} catch (Exception err) {
log.error("[getDashboardConfiguration]", err);
}
return null;
}
-
- /*
- * Shopsystem
- *
- * public zahlungsarten[] getZahlungsarten(String SID){ return
- * ResHandler.getZahlungsarten(SID); } public lieferarten[]
- * getLieferarten(String SID){ return ResHandler.getLieferarten(SID); }
- * public products[] getProductsByCat(String SID){ return
- * ResHandler.getProductByCat(SID); } public products[]
searchProduct(String
- * SID,String searchstring){ return
- * ResHandler.searchProduct(SID,searchstring); } public products[]
- * getProductsByCatID(String SID,String cat, int start){ return
- * ResHandler.getProductByCat(SID,start,cat); } public products[]
- * getAllProductByCat(String SID,String cat){ return
- * ResHandler.getAllProductByCat(SID,cat); } public products
- * getProductByID(String SID, int artnumber){ return
- * ResHandler.getProductByID(SID,artnumber); } public Userwaren[]
- * getUserwaren(String SID){ return ResHandler.getUserwaren(SID); }
public
- * Userwaren getUserwarenByID(String SID,int WAREN_ID){ return
- * ResHandler.getUserwarenByID(SID,WAREN_ID); } public String
- * addWarenkorb(String SID, int ARTICLE_ID, int amount){ return
- * ResHandler.addWarenkorb(SID,ARTICLE_ID,amount); } public String
- * updateWarenkorb(String SID, int WAREN_ID, int status, int
ZAHLUNGS_ID,
- * int LIEFER_ID, int amount, String comment){ return
- * ResHandler.updateWarenkorb(SID, WAREN_ID, status, ZAHLUNGS_ID,
LIEFER_ID,
- * amount, comment); } public String deleteWarenkorb(String SID, int
- * WAREN_ID){ return ResHandler.deleteWarenkorb(SID,WAREN_ID); }
- */
-
}
Modified:
incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml?rev=1363219&r1=1363218&r2=1363219&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
(original)
+++ incubator/openmeetings/trunk/singlewebapp/xdocs/GeneralConfiguration.xml
Thu Jul 19 05:29:18 2012
@@ -91,6 +91,12 @@
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> The path to OpenOffice/LibreOffice (optional) please
set this to the real path in case jodconverter is unable to find
OpenOffice/LibreOffice installation automatically </td>
<td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.0.x </td>
</tr>
+ <tr>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> default.landing.zone </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> dashboard.rooms </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> Area to be shown to the user after login. Possible
values are: dashboard.rooms, dashboard.chat, calendar, rooms.public,
rooms.private, rooms.user </td>
+ <td style="border: 1px solid rgb(204,
204, 204); padding: 5px;"> 2.1.x </td>
+ </tr>
</table>
</section>
