Merge remote-tracking branch 'upstream/master'

modules/Calendar/models/FilterRecordStructure.php

@@ -41,6 +41,25 @@ class Calendar_FilterRecordStructure_Model extends Vtiger_FilterRecordStructure_
 			}
 		}
 
+        $eventsModuleModel = Vtiger_Module_Model::getInstance('Events');
+        $eventsStructureModel = Vtiger_RecordStructure_Model::getInstanceForModule($eventsModuleModel, Vtiger_RecordStructure_Model::RECORD_STRUCTURE_MODE_FILTER);
+        $blockModelList = $eventsStructureModel->getModule()->getBlocks();
+        foreach ($blockModelList as $blockLabel => $blockModel) {
+            $fieldModelList = $blockModel->getFields();
+            if ($fieldModelList) {
+                $values[vtranslate($blockLabel, 'Events')] = array();
+                foreach ($fieldModelList as $fieldName => $fieldModel) {
+                    if ($fieldModel->isViewableInFilterView()) {
+                        $newFieldModel = clone $fieldModel;
+                        if ($recordExists) {
+                            $newFieldModel->set('fieldvalue', $recordModel->get($fieldName));
+                        }
+                        $values[vtranslate($blockLabel, 'Events')][$fieldName] = $newFieldModel;
+                    }
+                }
+            }
+        }
+
 		//All the reference fields should also be sent
 		$fields = $moduleModel->getFieldsByType(array('reference'));
 		foreach ($fields as $parentFieldName => $field) {

modules/Calendar/uitypes/Datetime.php

@@ -10,7 +10,7 @@
 
 class Calendar_Datetime_UIType extends Vtiger_Datetime_UIType {
 	
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		//Since date_start and due_date fields of calendar can have time appended or removed
 		if($this->hasTimeComponent($value)) {
 			return self::getDisplayDateTimeValue($value);

modules/Documents/uitypes/Text.php

@@ -15,7 +15,7 @@ class Documents_Text_UIType extends Vtiger_Text_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		return $value;
 	}
     

modules/Vtiger/uitypes/CurrencyList.php

@@ -17,7 +17,7 @@ class Vtiger_CurrencyList_UIType extends Vtiger_Base_UIType {
 		return 'uitypes/CurrencyList.tpl';
 	}
 
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		$db = PearDatabase::getInstance();
 		$result = $db->pquery('SELECT currency_name FROM vtiger_currency_info WHERE currency_status = ? AND id = ?',
 					array('Active', $value));

modules/Vtiger/uitypes/DocumentsFolder.php

@@ -23,7 +23,7 @@ class Vtiger_DocumentsFolder_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		$db = PearDatabase::getInstance();
 		$result = $db->pquery('SELECT * FROM vtiger_attachmentsfolder WHERE folderid = ?', array($value));
 		if($db->num_rows($result)) {

modules/Vtiger/uitypes/Double.php

@@ -23,7 +23,7 @@ class Vtiger_Double_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		return decimalFormat($value);
 	}
 

modules/Vtiger/uitypes/FileLocationType.php

@@ -23,7 +23,7 @@ class Vtiger_FileLocationType_UIType extends Vtiger_Base_UIType {
 	 * @param <String> value of field
 	 * @return <String> Converted value
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		if ($value === 'I') {
 			$value = 'LBL_INTERNAL';
 		} else {

modules/Vtiger/uitypes/Multiowner.php

@@ -23,7 +23,7 @@ class Vtiger_Multiowner_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($values) {
+	public function getDisplayValue($values, $record=false, $recordInstance=false) {
         if($values == NULL && !is_array($values)) return;
         foreach($values as $value){
             if (self::getOwnerType($value) === 'User') {

modules/Vtiger/uitypes/Multipicklist.php

@@ -23,7 +23,7 @@ class Vtiger_Multipicklist_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 
 		$moduleName = $this->get('field')->getModuleName();
 		$value = explode(' |##| ', $value);

modules/Vtiger/uitypes/Ownergroup.php

@@ -23,7 +23,7 @@ class Vtiger_Ownergroup_UIType extends Vtiger_Owner_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		$recordModel = new Settings_Groups_Record_Model();
 		$recordModel->set('groupid', $value);
 		$detailViewUrl = $recordModel->getDetailViewUrl();

modules/Vtiger/uitypes/Reminder.php

@@ -31,7 +31,7 @@ class Vtiger_Reminder_UIType extends Vtiger_Date_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
         $reminder_value = '';
         $reminder_time = $this->getEditViewDisplayValue($value);
 		if(!empty($reminder_time[0])){

modules/Vtiger/uitypes/Theme.php

@@ -23,7 +23,7 @@ class Vtiger_Theme_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return <Object>
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		$allSkins = Vtiger_Theme::getAllSkins();
 		$skinColor = $allSkins[$value];
 		$value = ucfirst($value);

modules/Vtiger/uitypes/Time.php

@@ -90,7 +90,7 @@ class Vtiger_Time_UIType extends Vtiger_Base_UIType {
 	 * @param <Object> $value
 	 * @return $value
 	 */
-	public function getDisplayValue($value) {
+	public function getDisplayValue($value, $record = false, $recordInstance=false) {
 		$userModel = Users_Privileges_Model::getCurrentUserModel();
 		if($userModel->get('hour_format') == '12'){
 			return self::getTimeValueInAMorPM($value);

modules/Vtiger/uitypes/UserReference.php

@@ -36,7 +36,7 @@ class Vtiger_UserReference_UIType extends Vtiger_Base_UIType {
 	 * @param <Number> $recordId
 	 * @return <String> display value
 	 */
-	public function getDisplayValue($value, $recordId) {
+	public function getDisplayValue($value, $record=false, $recordInstance=false) {
 		$displayValue = $this->getEditViewDisplayValue($value);
 		$currentUserModel = Users_Record_Model::getCurrentUserModel();
 		if ($currentUserModel->isAdminUser()) {