New invities are marked tentative automatically and mails are sent t…

…o the organizer #41 ::: #19
Ericsson · Nov 6, 2014 · e0f5be5 · e0f5be5
1 parent 0a46a1e
commit e0f5be5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/chrome/content/exchangeSettings.js b/chrome/content/exchangeSettings.js
@@ -263,6 +263,7 @@ exchExchangeSettings.prototype = {
 			    .getBranch("[email protected]."+calId+".");		
 		this._document.getElementById("exchWebService-poll-calendar-interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecCalendarPollInterval", 60);
 		this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingdeletecancelleditems", true);
+		this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingmarkeventtentative", false);
 /*
 		this._document.getElementById("exchWebService-poll-inbox").checked = this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecPollInbox", true);
 		this._document.getElementById("exchWebService-poll-inbox-interval").value = this.globalFunctions.safeGetIntPref(exchWebServicesCalPrefs, "ecPollInboxInterval", 180);
@@ -316,6 +317,10 @@ exchExchangeSettings.prototype = {
 		if ( this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked != this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingdeletecancelleditems",null) )
 		{  
 			exchWebServicesCalPrefs.setBoolPref("ecautoprocessingdeletecancelleditems", this._document.getElementById("exchWebService-autoprocessingproperties-deletecancelleditems").checked);
+		}
+		if ( this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked != this.globalFunctions.safeGetBoolPref(exchWebServicesCalPrefs, "ecautoprocessingmarkeventtentative",null) )
+		{  
+			exchWebServicesCalPrefs.setBoolPref("ecautoprocessingmarkeventtentative", this._document.getElementById("exchWebService-autoprocessingproperties-markeventtentative").checked);
 		}
 			this.doAutoProcessing();
 

diff --git a/chrome/content/exchangeSettings.xul b/chrome/content/exchangeSettings.xul
@@ -386,14 +386,21 @@
 	            <tabpanel id="exchWebService-autoprocessing-properties">
                  <vbox flex="1">
                     <groupbox id="exchWebService-autoprocessingproperties-detaisgroupbox">
-                         <caption label="Details:" />
+                         <caption label="Preferences:" />
                          <vbox>
                              <hbox>
                                  <checkbox label="&label.autoprocessingproperties.deletecancelleditems;" id="exchWebService-autoprocessingproperties-deletecancelleditems"
                                       disabled="false"/> 
                             </hbox>
                         </vbox>  
-                    </groupbox>                             
+                         <vbox>
+                             <hbox>
+                                 <checkbox label="&label.autoprocessingproperties.markeventtentative;" id="exchWebService-autoprocessingproperties-markeventtentative"
+                                      disabled="false"/> 
+                            </hbox> 
+                        </vbox>  
+                    </groupbox>   
+
                 </vbox> 
             </tabpanel> 
 		</tabpanels>

diff --git a/interfaces/exchangeCalendar/mivExchangeCalendar.js b/interfaces/exchangeCalendar/mivExchangeCalendar.js
@@ -3367,7 +3367,11 @@ try{
 	},
 
 	get deleteCancelledInvitation() {
-		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingdeletecancelleditems", false);
+		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingdeletecancelleditems", true);
+	},
+
+	get markEventasTentative() {
+		return this.globalFunctions.safeGetBoolPref(this.prefs, "ecautoprocessingmarkeventtentative", false);
 	},
 
 	checkInbox: function _checkInbox()
@@ -7189,9 +7193,9 @@ dump("\n== removed ==:"+aCalendarEvent.toString()+"\n");
 					this.itemCount++;
 					isOldCacheItem=false;  
 
-					if (this.debug) this.logInfo("updateCalendar2: setTentative:"+ item.title); 
-					if ( isEvent(aItem) )
+					if ( isEvent(aItem) && this.markEventasTentative )
 					{
+						if (this.debug) this.logInfo("updateCalendar2: setTentative:"+ item.title);  
 							this.setTentative(aItem,aItems[index],isOldCacheItem);
 					}
 					if (this.debug) this.logInfo("updateCalendar2: onAddItem:"+ item.title);

diff --git a/locale/exchangecalendar/en-US/exchangeSettings.dtd b/locale/exchangecalendar/en-US/exchangeSettings.dtd
@@ -45,4 +45,5 @@
 <!ENTITY ecsettings.tab.autoprocessingproperties "Automatic Processing">
 
 <!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove cancelled events">
-
+<!ENTITY label.autoprocessingproperties.markeventtentative "Automatically mark event as tentative and send response to organizer">
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -45,4 +45,5 @@
		<!ENTITY ecsettings.tab.autoprocessingproperties "Automatic Processing">

		<!ENTITY label.autoprocessingproperties.deletecancelleditems "Automatically remove cancelled events">

		<!ENTITY label.autoprocessingproperties.markeventtentative "Automatically mark event as tentative and send response to organizer">