You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by gg...@apache.org on 2011/12/28 06:35:21 UTC

svn commit: r1225100 - in /incubator/openmeetings/trunk/singlewebapp: WebContent/src/modules/invitation/ src/app/org/openmeetings/app/data/conference/ src/app/org/openmeetings/app/remote/

Author: ggrekhov
Date: Wed Dec 28 05:35:21 2011
New Revision: 1225100

URL: http://svn.apache.org/viewvc?rev=1225100&view=rev
Log:
OPENMEETINGS-5 is fixed

Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx?rev=1225100&r1=1225099&r2=1225100&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/invitationQuickLoader.lzx Wed Dec 28 05:35:21 2011
@@ -18,6 +18,12 @@
 				this.invitation_pass.setAttribute('visibility','visible');
 			} else {
 				this.showLoginStep();
+                if ($debug) Debug.write("invitationQuickLoader:oninit userlang = [",userlang,"]; canvas.lang = [",canvas.language_id,"]");
+                if (canvas.language_id > 0) {
+                    this.getRoomClients.doCall();
+                } else {
+                    this.showLoginStep();
+                }
 			}
 		</handler>
 		
@@ -141,10 +147,15 @@
 	            <handler name="ondata" args="value">
 	            	//The onResult-Handler will be called be the rtmpconnection
                   	<![CDATA[
+                        var selVal = canvas.language_id;
+                        var found = false;
                   		for (var i=0;i<value.length;i++){
 	                  		this.parent.addItem(value[i].name,value[i].language_id);
+                            if (value[i].language_id == selVal) {
+                                found = true;
+                            }
 		                }
-                		this.parent.selectItem(value[0].language_id);
+                		this.parent.selectItem((found) ? selVal : value[0].language_id);
 		            ]]>
 				</handler>  
 			</netRemoteCallHib>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx?rev=1225100&r1=1225099&r2=1225100&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/invitation/inviteMainWindow.lzx Wed Dec 28 05:35:21 2011
@@ -7,7 +7,7 @@
 		label: send invitation
 	-->
 	<class name="inviteMainWindow" extends="labelExplorerBox" labelid="214" 
-			docking="true" closable="true" width="464" x="200" y="100" height="410">
+			docking="true" closable="true" width="464" x="200" y="100" height="440">
 		
 		<attribute name="roomType" value="conference" type="string" />
 		<attribute name="baseUrl" value="http://www.denic.de" type="string" />
@@ -113,9 +113,29 @@
          			   fontsize="11" style="componentStyle">
             <labeldTextListItem datapath="timeZoneSet:/item" text="$path{ 'frontEndLabel/text()' }" 
                 value="$path{ 'jname/text()' }" />
-        </resetCombobox>    
+        </resetCombobox>
          
-		<!-- label: send -->
+		<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>
+        </resetCombobox>
+
+        <!-- label: send -->
 		<simpleLabelButton labelid="218" x="$once{ parent.width-260 }" width="120" y="$once{ parent.height-26 }">
 			<handler name="onclick">
 				<![CDATA[
@@ -167,8 +187,8 @@
 	            <netparam name="validFromTime"><method name="getValue">return parent.parent._timeFrom.getText();</method></netparam>
 	            <netparam name="validToDate"><method name="getValue">return parent.parent._valid_to.getDate();</method></netparam>
 	            <netparam name="validToTime"><method name="getValue">return parent.parent._timeTo.getText();</method></netparam>
-                <netparam><method name="getValue">return hib.userlang;</method></netparam>
-                <netparam><method name="getValue">return parent.parent._timeZone.getValue();</method></netparam>
+                <netparam name="language_id"><method name="getValue">return parent.parent._languages.getValue();</method></netparam>
+                <netparam name="jNameTimeZone"><method name="getValue">return parent.parent._timeZone.getValue();</method></netparam>
                 
 	            <handler name="ondata" args="value">
 	            	<![CDATA[

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java?rev=1225100&r1=1225099&r2=1225100&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/data/conference/Invitationmanagement.java Wed Dec 28 05:35:21 2011
@@ -577,7 +577,15 @@ public class Invitationmanagement {
 	// ---------------------------------------------------------------------------------------------------------
 
 	/**
-	 * 
+     * @param username
+     * @param message
+     * @param baseurl
+     * @param email
+     * @param subject
+     * @param invitationsHash
+     * @param dStart
+     * @param dEnd
+	 * @param language_id   If it is >0 then "&language=" is added to the link
 	 */
 	private String sendInvitionLink(String username, String message,
 			String baseurl, String email, String subject,
@@ -587,6 +595,10 @@ public class Invitationmanagement {
 			String invitation_link = baseurl + "?invitationHash="
 					+ invitationsHash;
 
+            if (language_id > 0) {
+                invitation_link += "&language=" + language_id.toString();
+            }
+
 			// Long default_lang_id = Long.valueOf(cfgManagement.
 			// getConfKey(3,"default_lang_id").getConf_value()).longValue();
 
@@ -800,6 +812,13 @@ public class Invitationmanagement {
 	 * @param email
 	 * @param subject
 	 * @param invitationsHash
+	 * @param appointMentId
+     * @param organizer_userId
+     * @param invitor
+     * @param language_id   If it is >0 then "&language=" is added to the link
+     * @param starttime
+     * @param endtime
+     * @param timezone
 	 * @return
 	 */
 	public String sendInvitionIcalLink(String username, String message,
@@ -812,6 +831,10 @@ public class Invitationmanagement {
 			String invitation_link = baseurl + "?invitationHash="
 					+ invitationsHash;
 
+            if (language_id > 0) {
+                invitation_link += "&language=" + language_id.toString();
+            }
+
 			// Long default_lang_id = Long.valueOf(cfgManagement.
 			// getConfKey(3,"default_lang_id").getConf_value()).longValue();
 			String template = invitationTemplate.getRegisterInvitationTemplate(

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java?rev=1225100&r1=1225099&r2=1225100&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/InvitationService.java Wed Dec 28 05:35:21 2011
@@ -57,6 +57,8 @@ public class InvitationService implement
 	 * @param validFromTime
 	 * @param validToDate
 	 * @param validToTime
+	 * @param language_id
+     * @param jNameTimeZone
 	 * @return
 	 */
 	public String sendInvitationHash(String SID, String username,