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/08/13 18:46:52 UTC
svn commit: r1513590 - in /openmeetings/trunk/singlewebapp:
WebContent/src/base/hibernate/ WebContent/src/modules/invitation/
src/org/apache/openmeetings/remote/
Author: solomax
Date: Tue Aug 13 16:46:51 2013
New Revision: 1513590
URL: http://svn.apache.org/r1513590
Log:
[OPENMEETINGS-755] Invitation window seems to work as expected
Modified:
openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
Modified: openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx?rev=1513590&r1=1513589&r2=1513590&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/base/hibernate/hibRtmpConnection.lzx Tue Aug 13 16:46:51 2013
@@ -177,13 +177,17 @@
} else if (canvas.wicketsid != null) {
canvas.sessionId = canvas.wicketsid;
canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSessionId", [canvas.sessionId]);
- canvas.thishib.loaderVar.setProgress();
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
this.getPublicSID.doCall();
} else {
this.refreshDelegate = new LzDelegate( this, "refreshSessionMeth" );
//lz.Timer.addTimer( this.refreshDelegate, 60000 );
lz.Timer.addTimer( this.refreshDelegate, canvas.refreshSession );
- canvas.thishib.loaderVar.setProgress();
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
//Load Session Data
this.getsessiondata.callRPC();
@@ -229,15 +233,21 @@
if (this.counterror<3){
this.counterror++;
//Debug.write("try ",this.counterror,"one");
- canvas.thishib.loaderVar.error.setAttribute('text',"try "+this.counterror);
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.error.setAttribute('text',"try "+this.counterror);
+ }
this.connect();
} else {
//Debug.write("connection failed");
- canvas.thishib.loaderVar.error.setAttribute('text',this.status);
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.error.setAttribute('text',this.status);
+ }
canvas.setAttribute('loadingmessage','connection failed');
new lz.labelerrorPopup(canvas,{errorlabelid:556});
}
- canvas.thishib.loaderVar._src.setAttribute('text',src);
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar._src.setAttribute('text',src);
+ }
}
]]>
</handler>
@@ -262,7 +272,9 @@
canvas.sessionObject = value;
canvas.sessionId = value.session_id;
canvas.sendViaLocalConnection(canvas.vid_lc_name, "setSessionId", [canvas.sessionId]);
- canvas.thishib.loaderVar.setProgress();
+ if (canvas.thishib.loaderVar != null) {
+ canvas.thishib.loaderVar.setProgress();
+ }
parent.getPublicSID.doCall();
</handler>
</netRemoteCallHib>
Modified: openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1513590&r1=1513589&r2=1513590&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx (original)
+++ openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx Tue Aug 13 16:46:51 2013
@@ -36,8 +36,6 @@
<handler name="oninit">
<![CDATA[
lz.ModeManager.makeModal(this);
- var pressEnter = new LzDelegate(this, "register");
- lz.Keys.callOnKeyCombo(pressEnter, ["enter"]);
getTimeZoneOffset(this);
@@ -57,28 +55,27 @@
this.setOffset(std_time_offset);
</method>
- <method name="setOffset" args="std_time_offset">
- <![CDATA[
- std_time_offset = Math.round(std_time_offset);
- var timeZoneJavaFormat = "Etc/GMT";
- if (std_time_offset > 0) {
- timeZoneJavaFormat += "+"+std_time_offset;
- } else {
- timeZoneJavaFormat += "-"+std_time_offset;
- }
-
- if ($debug) Debug.write("timeZoneJavaFormat :: ",timeZoneJavaFormat);
-
- var tItem = this._timeZone.getItem(timeZoneJavaFormat);
-
- if (tItem != null) {
- this._timeZone.selectItem(timeZoneJavaFormat);
- } else {
- this._timeZone.selectItemAt(0);
- }
-
- ]]>
- </method>
+ <method name="setOffset" args="std_time_offset">
+ <![CDATA[
+ std_time_offset = Math.round(std_time_offset);
+ var timeZoneJavaFormat = "Etc/GMT";
+ if (std_time_offset > 0) {
+ timeZoneJavaFormat += "+"+std_time_offset;
+ } else {
+ timeZoneJavaFormat += "-"+std_time_offset;
+ }
+
+ if ($debug) Debug.write("timeZoneJavaFormat :: ",timeZoneJavaFormat);
+
+ var tItem = this._timeZone.getItem(timeZoneJavaFormat);
+ if (tItem != null) {
+ this._timeZone.selectItem(timeZoneJavaFormat);
+ } else {
+ this._timeZone.selectItemAt(0);
+ }
+ this._languages.selectItem(canvas.language_id);
+ ]]>
+ </method>
<handler name="onclose">
lz.ModeManager.release(this);
@@ -137,28 +134,13 @@
<resetCombobox name="_timeZone" editable="false" y="344" width="270" x="120"
enabled="${ ((parent._valid.value==2) ? true : false ) }"
fontsize="11" style="componentStyle">
- <labeldTextListItem datapath="timeZoneSet:/item" text="$path{ 'frontEndLabel/text()' }"
- value="$path{ 'jname/text()' }" />
+ <labeldTextListItem datapath="timeZoneSet:/item" text="$path{ 'text()' }" value="$path{ 'text()' }"/>
</resetCombobox>
<labelText labelid="59" width="200" y="374" x="4" />
<resetCombobox name="_languages" editable="false" y="374" width="270" x="120"
fontsize="11" style="componentStyle">
- <netRemoteCallHib name="getLanguages" funcname="languageservice.getLanguages" remotecontext="$once{ canvas.thishib }" >
- <handler name="oninit">
- this.doCall();
- </handler>
-
- <handler name="ondata" args="value">
- //The onResult-Handler will be called be the rtmpconnection
- <![CDATA[
- for (var i=0; i<value.length; i++) {
- parent.addItem(value[i].name,value[i].language_id);
- }
- parent.selectItem(canvas.language_id);
- ]]>
- </handler>
- </netRemoteCallHib>
+ <labeldTextListItem datapath="languagesSet:/item" text="$path{ 'name/text()' }" value="$path{ 'language_id/text()' }"/>
</resetCombobox>
<customEdittext name="_url" enabled="false" width="$once{ parent.width - 10 }" x="5" y="405" text=""/>
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java?rev=1513590&r1=1513589&r2=1513590&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/InvitationService.java Tue Aug 13 16:46:51 2013
@@ -78,7 +78,7 @@ public class InvitationService implement
* @param validToDate
* @param validToTime
* @param language_id
- * @param jNameTimeZone
+ * @param iCalTz
* @return - invitation object in case of success, "Sys - Error" string or null in case of error
*/
public Object sendInvitationHash(String SID, String username,
@@ -86,7 +86,7 @@ public class InvitationService implement
Long room_id, String conferencedomain, Boolean isPasswordProtected,
String invitationpass, Integer valid, Date validFromDate,
String validFromTime, Date validToDate, String validToTime,
- Long language_id, String jNameTimeZone, boolean sendMail) {
+ Long language_id, String iCalTz, boolean sendMail) {
try {
log.debug("sendInvitationHash: ");
@@ -110,7 +110,7 @@ public class InvitationService implement
Calendar date = Calendar.getInstance();
date.setTime(validFromDate);
- TimeZone timeZone = timezoneUtil.getTimezoneByInternalJName(jNameTimeZone);
+ TimeZone timeZone = timezoneUtil.getTimeZone(iCalTz);
Calendar calFrom = Calendar.getInstance(timeZone);
calFrom.set(Calendar.YEAR, date.get(Calendar.YEAR));
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java?rev=1513590&r1=1513589&r2=1513590&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/remote/LanguageService.java Tue Aug 13 16:46:51 2013
@@ -23,17 +23,11 @@ import static org.apache.openmeetings.pe
import java.util.List;
import java.util.Map;
-import org.apache.openmeetings.OpenmeetingsVariables;
-import org.apache.openmeetings.data.basic.AuthLevelUtil;
import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.data.basic.FieldManager;
-import org.apache.openmeetings.data.basic.SessiondataDao;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
-import org.apache.openmeetings.data.user.UserManager;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
-import org.red5.logging.Red5LoggerFactory;
-import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
/**
@@ -42,21 +36,12 @@ import org.springframework.beans.factory
*
*/
public class LanguageService {
-
- private static final Logger log = Red5LoggerFactory.getLogger(
- LanguageService.class, OpenmeetingsVariables.webAppRootKey);
- @Autowired
- private SessiondataDao sessiondataDao;
@Autowired
private ConfigurationDao configurationDao;
@Autowired
- private UserManager userManager;
- @Autowired
private FieldManager fieldManager;
@Autowired
private FieldLanguageDao fieldLanguageDaoImpl;
- @Autowired
- private AuthLevelUtil authLevelUtil;
/**
* @return - List of all available Languages
@@ -91,6 +76,4 @@ public class LanguageService {
int start, int max) {
return fieldManager.getLabelsByLanguage(language_id, start, max);
}
-
-
}