Completed
Push — master ( 58f496...a833c2 )
by Adam
18:52
created
modules/Meetings/JoinExternalMeeting.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -70,7 +70,7 @@
 block discarded – undo
70 70
     }
71 71
 }else{
72 72
     if(isset($row['id']) || $meetingBean->assigned_user_id == $GLOBALS['current_user']->id || is_admin($GLOBALS['current_user']) || is_admin_for_module($GLOBALS['current_user'],'Meetings')){
73
-      SugarApplication::redirect($meetingBean->join_url);
73
+        SugarApplication::redirect($meetingBean->join_url);
74 74
     }else{
75 75
         //if the user is not invited or the owner of the meeting or an admin then they cannot join the meeting.
76 76
         $tplFile = 'modules/Meetings/tpls/extMeetingNotInvited.tpl';
Please login to merge, or discard this patch.
modules/Meetings/language/en_us.lang.php 1 patch
Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -47,75 +47,75 @@  discard block
 block discarded – undo
47 47
  ********************************************************************************/
48 48
 
49 49
 $mod_strings = array (
50
-	'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
50
+    'ERR_DELETE_RECORD' => 'A record number must be specified to delete the meeting.',
51 51
 
52
-	'LBL_ACCEPT_THIS'=>'Accept?',
53
-	'LBL_ADD_BUTTON'=> 'Add',
54
-	'LBL_ADD_INVITEE' => 'Add Invitees',
55
-	'LBL_COLON' => ':',
56
-	'LBL_CONTACT_NAME' => 'Contact:',
57
-	'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
58
-	'LBL_CREATED_BY'=>'Created by',
59
-	'LBL_DATE_END'=>'End Date',
60
-	'LBL_DATE_TIME' => 'Start Date & Time:',
61
-	'LBL_DATE' => 'Start Date:',
62
-	'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
63
-	'LBL_DEL'=> 'Del',
64
-	'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
65
-	'LBL_DESCRIPTION' => 'Description:',
52
+    'LBL_ACCEPT_THIS'=>'Accept?',
53
+    'LBL_ADD_BUTTON'=> 'Add',
54
+    'LBL_ADD_INVITEE' => 'Add Invitees',
55
+    'LBL_COLON' => ':',
56
+    'LBL_CONTACT_NAME' => 'Contact:',
57
+    'LBL_CONTACTS_SUBPANEL_TITLE' => 'Contacts',
58
+    'LBL_CREATED_BY'=>'Created by',
59
+    'LBL_DATE_END'=>'End Date',
60
+    'LBL_DATE_TIME' => 'Start Date & Time:',
61
+    'LBL_DATE' => 'Start Date:',
62
+    'LBL_DEFAULT_SUBPANEL_TITLE' => 'Meetings',
63
+    'LBL_DEL'=> 'Del',
64
+    'LBL_DESCRIPTION_INFORMATION' => 'Description Information',
65
+    'LBL_DESCRIPTION' => 'Description:',
66 66
     'LBL_DIRECTION' => 'Direction:',
67
-	'LBL_DURATION_HOURS' => 'Duration Hours:',
68
-	'LBL_DURATION_MINUTES' => 'Duration Minutes:',
69
-	'LBL_DURATION' => 'Duration:',
70
-	'LBL_EMAIL' => 'Email',
71
-	'LBL_FIRST_NAME' => 'First Name',
72
-	'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
73
-	'LBL_HOURS_ABBREV' => 'h',
74
-	'LBL_HOURS_MINS' => '(hours/minutes)',
75
-	'LBL_INVITEE' => 'Invitees',
76
-	'LBL_LAST_NAME' => 'Last Name',
77
-	'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
78
-	'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
79
-	'LBL_LIST_CLOSE' => 'Close',
80
-	'LBL_LIST_CONTACT' => 'Contact',
81
-	'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
82
-	'LBL_LIST_DATE' => 'Start Date',
83
-	'LBL_LIST_DIRECTION' => 'Direction',
84
-	'LBL_LIST_DUE_DATE'=>'Due Date',
85
-	'LBL_LIST_FORM_TITLE' => 'Meeting List',
86
-	'LBL_LIST_MY_MEETINGS' => 'My Meetings',
87
-	'LBL_LIST_RELATED_TO' => 'Related to',
88
-	'LBL_LIST_STATUS'=>'Status',
89
-	'LBL_LIST_SUBJECT' => 'Subject',
90
-	'LBL_LIST_TIME' => 'Start Time',
91
-	'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
92
-	'LBL_LOCATION' => 'Location:',
93
-	'LBL_MEETING' => 'Meeting:',
94
-	'LBL_MINSS_ABBREV' => 'm',
95
-	'LBL_MODIFIED_BY'=>'Modified by',
96
-	'LBL_MODULE_NAME' => 'Meetings',
97
-	'LBL_MODULE_TITLE' => 'Meetings: Home',
98
-	'LBL_NAME' => 'Name',
99
-	'LBL_NEW_FORM_TITLE' => 'Create Appointment',
100
-	'LBL_OUTLOOK_ID' => 'Outlook ID',
101
-	'LBL_SEQUENCE' => 'Meeting update sequence',
102
-	'LBL_PHONE' => 'Phone Office:',
103
-	'LBL_REMINDER_TIME'=>'Reminder Time',
67
+    'LBL_DURATION_HOURS' => 'Duration Hours:',
68
+    'LBL_DURATION_MINUTES' => 'Duration Minutes:',
69
+    'LBL_DURATION' => 'Duration:',
70
+    'LBL_EMAIL' => 'Email',
71
+    'LBL_FIRST_NAME' => 'First Name',
72
+    'LBL_HISTORY_SUBPANEL_TITLE' => 'Notes',
73
+    'LBL_HOURS_ABBREV' => 'h',
74
+    'LBL_HOURS_MINS' => '(hours/minutes)',
75
+    'LBL_INVITEE' => 'Invitees',
76
+    'LBL_LAST_NAME' => 'Last Name',
77
+    'LBL_ASSIGNED_TO_NAME'=>'Assigned to:',
78
+    'LBL_LIST_ASSIGNED_TO_NAME' => 'Assigned User',
79
+    'LBL_LIST_CLOSE' => 'Close',
80
+    'LBL_LIST_CONTACT' => 'Contact',
81
+    'LBL_LIST_DATE_MODIFIED'=>'Date Modified',
82
+    'LBL_LIST_DATE' => 'Start Date',
83
+    'LBL_LIST_DIRECTION' => 'Direction',
84
+    'LBL_LIST_DUE_DATE'=>'Due Date',
85
+    'LBL_LIST_FORM_TITLE' => 'Meeting List',
86
+    'LBL_LIST_MY_MEETINGS' => 'My Meetings',
87
+    'LBL_LIST_RELATED_TO' => 'Related to',
88
+    'LBL_LIST_STATUS'=>'Status',
89
+    'LBL_LIST_SUBJECT' => 'Subject',
90
+    'LBL_LIST_TIME' => 'Start Time',
91
+    'LBL_LEADS_SUBPANEL_TITLE' => 'Leads',
92
+    'LBL_LOCATION' => 'Location:',
93
+    'LBL_MEETING' => 'Meeting:',
94
+    'LBL_MINSS_ABBREV' => 'm',
95
+    'LBL_MODIFIED_BY'=>'Modified by',
96
+    'LBL_MODULE_NAME' => 'Meetings',
97
+    'LBL_MODULE_TITLE' => 'Meetings: Home',
98
+    'LBL_NAME' => 'Name',
99
+    'LBL_NEW_FORM_TITLE' => 'Create Appointment',
100
+    'LBL_OUTLOOK_ID' => 'Outlook ID',
101
+    'LBL_SEQUENCE' => 'Meeting update sequence',
102
+    'LBL_PHONE' => 'Phone Office:',
103
+    'LBL_REMINDER_TIME'=>'Reminder Time',
104 104
     'LBL_EMAIL_REMINDER_SENT' => 'Email reminder sent',
105
-	'LBL_REMINDER' => 'Reminders:',
106
-	'LBL_REMINDER_POPUP' => 'Popup',
107
-	'LBL_REMINDER_EMAIL' => 'Email',
105
+    'LBL_REMINDER' => 'Reminders:',
106
+    'LBL_REMINDER_POPUP' => 'Popup',
107
+    'LBL_REMINDER_EMAIL' => 'Email',
108 108
     'LBL_REMINDER_EMAIL_ALL_INVITEES' => 'Email all invitees',
109 109
     'LBL_EMAIL_REMINDER' => 'Email Reminder',
110 110
     'LBL_EMAIL_REMINDER_TIME' => 'Email Reminder Time',
111 111
     'LBL_REMOVE' => 'rem',
112
-	'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
113
-	'LBL_SEARCH_BUTTON'=> 'Search',
114
-	'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
115
-	'LBL_SEND_BUTTON_KEY'=>'I',
116
-	'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
117
-	'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
118
-	'LBL_STATUS' => 'Status:',
112
+    'LBL_SCHEDULING_FORM_TITLE' => 'Scheduling',
113
+    'LBL_SEARCH_BUTTON'=> 'Search',
114
+    'LBL_SEARCH_FORM_TITLE' => 'Meeting Search',
115
+    'LBL_SEND_BUTTON_KEY'=>'I',
116
+    'LBL_SEND_BUTTON_LABEL'=>'Save & Send Invites',
117
+    'LBL_SEND_BUTTON_TITLE'=>'Save & Send Invites',
118
+    'LBL_STATUS' => 'Status:',
119 119
     'LBL_TYPE' => 'Meeting Type',
120 120
     'LBL_PASSWORD' => 'Meeting Password',
121 121
     'LBL_URL' => 'Start/Join Meeting',
@@ -123,25 +123,25 @@  discard block
 block discarded – undo
123 123
     'LBL_DISPLAYED_URL' => 'Display URL',
124 124
     'LBL_CREATOR' => 'Meeting Creator',
125 125
     'LBL_EXTERNALID' => 'External App ID',
126
-	'LBL_SUBJECT' => 'Subject:',
127
-	'LBL_TIME' => 'Start Time:',
128
-	'LBL_USERS_SUBPANEL_TITLE' => 'Users',
129
-	'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
126
+    'LBL_SUBJECT' => 'Subject:',
127
+    'LBL_TIME' => 'Start Time:',
128
+    'LBL_USERS_SUBPANEL_TITLE' => 'Users',
129
+    'LBL_ACTIVITIES_REPORTS' => 'Activities Report',
130 130
     'LBL_PARENT_TYPE' => 'Parent Type',
131 131
     'LBL_PARENT_ID' => 'Parent ID',
132
-	'LNK_MEETING_LIST'=>'View Meetings',
133
-	'LNK_NEW_APPOINTMENT' => 'Create Appointment',
134
-	'LNK_NEW_MEETING'=>'Schedule Meeting',
135
-	'LNK_IMPORT_MEETINGS' => 'Import Meetings',
132
+    'LNK_MEETING_LIST'=>'View Meetings',
133
+    'LNK_NEW_APPOINTMENT' => 'Create Appointment',
134
+    'LNK_NEW_MEETING'=>'Schedule Meeting',
135
+    'LNK_IMPORT_MEETINGS' => 'Import Meetings',
136 136
 
137
-	'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
137
+    'NTC_REMOVE_INVITEE' => 'Are you sure you want to remove this invitee from the meeting?',
138 138
     'LBL_CREATED_USER' => 'Created User',
139 139
     'LBL_MODIFIED_USER' => 'Modified User',
140 140
     'NOTICE_DURATION_TIME' => 'Duration time must be greater than 0',
141 141
     'LBL_MEETING_INFORMATION' => 'Overview',
142
-	'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
143
-	'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
144
-	'LBL_HOST_EXT_MEETING' => 'Start Meeting',
142
+    'LBL_LIST_JOIN_MEETING' => 'Join Meeting',
143
+    'LBL_JOIN_EXT_MEETING' => 'Join Meeting',
144
+    'LBL_HOST_EXT_MEETING' => 'Start Meeting',
145 145
     'LBL_ACCEPT_STATUS' => 'Accept Status',
146 146
     'LBL_ACCEPT_LINK' => 'Accept Link',
147 147
     // You are not invited to the meeting messages
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
     'LBL_EXTNOSTART_HEADER' => 'Error: Cannot Start Meeting',
155 155
     'LBL_EXTNOSTART_MAIN' => 'You cannot start this meeting because you are not an Administrator or the owner of the meeting.',
156 156
 
157
-  //For export labels
157
+    //For export labels
158 158
     'LBL_EXPORT_JOIN_URL' => 'Join Url',
159 159
     'LBL_EXPORT_HOST_URL' => 'Host Url',
160 160
     'LBL_EXPORT_DISPLAYED_URL' => 'Displayed Url',
@@ -190,14 +190,14 @@  discard block
 block discarded – undo
190 190
     'LBL_SYNCED_RECURRING_MSG' => 'This meeting originated in another system and was synced to SuiteCRM. To make changes, go to the original meeting within the other system. Changes made in the other system can be synced to this record.',
191 191
     'LBL_RELATED_TO' => 'Related to:',
192 192
 
193
-	// for reminders
194
-	'LBL_REMINDERS' => 'Reminders',
195
-	'LBL_REMINDERS_ACTIONS' => 'Actions:',
196
-	'LBL_REMINDERS_POPUP' => 'Popup',
197
-	'LBL_REMINDERS_EMAIL' => 'Email invitees',
198
-	'LBL_REMINDERS_WHEN' => 'When:',
199
-	'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
200
-	'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
201
-	'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
193
+    // for reminders
194
+    'LBL_REMINDERS' => 'Reminders',
195
+    'LBL_REMINDERS_ACTIONS' => 'Actions:',
196
+    'LBL_REMINDERS_POPUP' => 'Popup',
197
+    'LBL_REMINDERS_EMAIL' => 'Email invitees',
198
+    'LBL_REMINDERS_WHEN' => 'When:',
199
+    'LBL_REMINDERS_REMOVE_REMINDER' => 'Remove reminder',
200
+    'LBL_REMINDERS_ADD_ALL_INVITEES' => 'Add All Invitees',
201
+    'LBL_REMINDERS_ADD_REMINDER' => 'Add reminder',
202 202
 );
203 203
 ?>
Please login to merge, or discard this patch.
modules/Meetings/MeetingsQuickCreate.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -54,9 +54,9 @@  discard block
 block discarded – undo
54 54
         parent::process();
55 55
 
56 56
         $this->ss->assign("STATUS_OPTIONS", get_select_options_with_id($app_list_strings['meeting_status_dom'], $app_list_strings['meeting_status_default']));
57
-		$this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
58
-		$this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
59
-		$this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
57
+        $this->ss->assign("CALENDAR_DATEFORMAT", $timedate->get_cal_date_format());
58
+        $this->ss->assign("TIME_FORMAT", '('. $timedate->get_user_time_format().')');
59
+        $this->ss->assign("USER_DATEFORMAT", '('. $timedate->get_user_date_format().')');
60 60
 		
61 61
 
62 62
 
@@ -75,52 +75,52 @@  discard block
 block discarded – undo
75 75
         $this->javascript->setSugarBean($focus);
76 76
         $this->javascript->addAllFields('');
77 77
 
78
-		if (is_null($focus->date_start))
79
-			$focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
80
-		if (is_null($focus->time_start))
81
-			$focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
82
-		if (!isset ($focus->duration_hours))
83
-			$focus->duration_hours = "1";
78
+        if (is_null($focus->date_start))
79
+            $focus->date_start = $timedate->to_display_date(TimeDate::getInstance()->nowDb());
80
+        if (is_null($focus->time_start))
81
+            $focus->time_start = $timedate->to_display_time(TimeDate::getInstance()->nowDb(), true);
82
+        if (!isset ($focus->duration_hours))
83
+            $focus->duration_hours = "1";
84 84
 
85 85
         
86 86
         $date_start_array=explode(" ",trim($focus->date_start));
87 87
         if (count($date_start_array)==2) {
88
-			$focus->time_start = $timedate->to_db_time($date_start_array[1], false);
89
-        	//$focus->date_start = $date_start_array[0];
88
+            $focus->time_start = $timedate->to_db_time($date_start_array[1], false);
89
+            //$focus->date_start = $date_start_array[0];
90 90
         }
91 91
 
92
-		$this->ss->assign("DATE_START", $focus->date_start);
93
-		$this->ss->assign("TIME_START", substr($focus->time_start,0,5));
94
-		$time_start_hour = intval(substr($focus->time_start, 0, 2));
95
-		$time_start_minutes = substr($focus->time_start, 3, 5);
92
+        $this->ss->assign("DATE_START", $focus->date_start);
93
+        $this->ss->assign("TIME_START", substr($focus->time_start,0,5));
94
+        $time_start_hour = intval(substr($focus->time_start, 0, 2));
95
+        $time_start_minutes = substr($focus->time_start, 3, 5);
96 96
 		
97
-		if ($time_start_minutes > 0 && $time_start_minutes < 15) {
98
-			$time_start_minutes = "15";
99
-		} else
100
-			if ($time_start_minutes > 15 && $time_start_minutes < 30) {
101
-				$time_start_minutes = "30";
102
-			} else
103
-				if ($time_start_minutes > 30 && $time_start_minutes < 45) {
104
-					$time_start_minutes = "45";
105
-				} else
106
-					if ($time_start_minutes > 45) {
107
-						$time_start_hour += 1;
108
-						$time_start_minutes = "00";
109
-					}
97
+        if ($time_start_minutes > 0 && $time_start_minutes < 15) {
98
+            $time_start_minutes = "15";
99
+        } else
100
+            if ($time_start_minutes > 15 && $time_start_minutes < 30) {
101
+                $time_start_minutes = "30";
102
+            } else
103
+                if ($time_start_minutes > 30 && $time_start_minutes < 45) {
104
+                    $time_start_minutes = "45";
105
+                } else
106
+                    if ($time_start_minutes > 45) {
107
+                        $time_start_hour += 1;
108
+                        $time_start_minutes = "00";
109
+                    }
110 110
 		
111 111
 		
112
-		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
113
-		$hours_arr = array ();
114
-		$num_of_hours = 24;
115
-		$start_at = 0;
112
+        // We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
113
+        $hours_arr = array ();
114
+        $num_of_hours = 24;
115
+        $start_at = 0;
116 116
 
117
-		$time_pref = $timedate->get_time_format();
118
-		if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
119
-		   $num_of_hours = 13;
120
-		   $start_at = 1;	
121
-		} 
117
+        $time_pref = $timedate->get_time_format();
118
+        if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
119
+            $num_of_hours = 13;
120
+            $start_at = 1;	
121
+        } 
122 122
 		
123
-		/*
123
+        /*
124 124
 		// Seems to be problematic... $time_meridiem is always empty
125 125
 		if (empty ($time_meridiem)) {
126 126
 			$num_of_hours = 24;
@@ -128,37 +128,37 @@  discard block
 block discarded – undo
128 128
 		}
129 129
 		*/
130 130
 		
131
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
132
-			$i = $i."";
133
-			if (strlen($i) == 1) {
134
-				$i = "0".$i;
135
-			}
136
-			$hours_arr[$i] = $i;
137
-		}
131
+        for ($i = $start_at; $i < $num_of_hours; $i ++) {
132
+            $i = $i."";
133
+            if (strlen($i) == 1) {
134
+                $i = "0".$i;
135
+            }
136
+            $hours_arr[$i] = $i;
137
+        }
138 138
 
139 139
         $this->ss->assign("TIME_START_HOUR_OPTIONS", get_select_options_with_id($hours_arr, $time_start_hour));
140
-		$this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
141
-		$this->ss->assign("DURATION_HOURS", $focus->duration_hours);
142
-		$this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
140
+        $this->ss->assign("TIME_START_MINUTE_OPTIONS", get_select_options_with_id($focus->minutes_values, $time_start_minutes));
141
+        $this->ss->assign("DURATION_HOURS", $focus->duration_hours);
142
+        $this->ss->assign("DURATION_MINUTES_OPTIONS", get_select_options_with_id($focus->minutes_values, $focus->duration_minutes));
143 143
         // Test to see if time format is 11:00am; otherwise it's 11:00AM 
144 144
         if($num_of_hours == 13) {    
145 145
         		
146
-		   if (strpos($time_pref, 'a')) {
146
+            if (strpos($time_pref, 'a')) {
147 147
 		   	   
148
-               if(!isset($focus->meridiem_am_values)) {
149
-                  $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
150
-               } 		
148
+                if(!isset($focus->meridiem_am_values)) {
149
+                    $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
150
+                } 		
151 151
                
152
-               $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
152
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
153 153
                
154
-		   } else {
155
-		       if(!isset($focus->meridiem_AM_values)) {
156
-		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
157
-		       }
154
+            } else {
155
+                if(!isset($focus->meridiem_AM_values)) {
156
+                    $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
157
+                }
158 158
 		       
159
-		       $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
159
+                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_AM_values, $time_start_hour < 12 ? 'AM' : 'PM'));
160 160
                
161
-		   } //if-else
161
+            } //if-else
162 162
            
163 163
         }
164 164
 
Please login to merge, or discard this patch.
modules/Meetings/metadata/searchdefs.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -39,85 +39,85 @@
 block discarded – undo
39 39
 
40 40
 $searchdefs ['Meetings'] = 
41 41
 array (
42
-  'layout' => 
43
-  array (
42
+    'layout' => 
43
+    array (
44 44
     'basic_search' => 
45 45
     array (
46
-      'name' => 
47
-      array (
46
+        'name' => 
47
+        array (
48 48
         'name' => 'name',
49 49
         'default' => true,
50 50
         'width' => '10%',
51
-      ),
52
-      'current_user_only' => 
53
-      array (
51
+        ),
52
+        'current_user_only' => 
53
+        array (
54 54
         'name' => 'current_user_only',
55 55
         'label' => 'LBL_CURRENT_USER_FILTER',
56 56
         'type' => 'bool',
57 57
         'default' => true,
58 58
         'width' => '10%',
59
-      ),
60
-      array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
61
-      array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
59
+        ),
60
+        array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
61
+        array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
62 62
     ),
63 63
     'advanced_search' => 
64 64
     array (
65
-      'name' => 
66
-      array (
65
+        'name' => 
66
+        array (
67 67
         'name' => 'name',
68 68
         'default' => true,
69 69
         'width' => '10%',
70
-      ),
71
-      'parent_name' => 
72
-      array (
70
+        ),
71
+        'parent_name' => 
72
+        array (
73 73
         'type' => 'parent',
74 74
         'label' => 'LBL_LIST_RELATED_TO',
75 75
         'width' => '10%',
76 76
         'default' => true,
77 77
         'name' => 'parent_name',
78
-      ),
79
-      'current_user_only' => 
80
-      array (
78
+        ),
79
+        'current_user_only' => 
80
+        array (
81 81
         'name' => 'current_user_only',
82 82
         'label' => 'LBL_CURRENT_USER_FILTER',
83 83
         'type' => 'bool',
84 84
         'default' => true,
85 85
         'width' => '10%',
86
-      ),
87
-      'status' => 
88
-      array (
86
+        ),
87
+        'status' => 
88
+        array (
89 89
         'name' => 'status',
90 90
         'default' => true,
91 91
         'width' => '10%',
92
-      ),
93
-      'assigned_user_id' => 
94
-      array (
92
+        ),
93
+        'assigned_user_id' => 
94
+        array (
95 95
         'name' => 'assigned_user_id',
96 96
         'type' => 'enum',
97 97
         'label' => 'LBL_ASSIGNED_TO',
98 98
         'function' => 
99 99
         array (
100
-          'name' => 'get_user_array',
101
-          'params' => 
102
-          array (
100
+            'name' => 'get_user_array',
101
+            'params' => 
102
+            array (
103 103
             0 => false,
104
-          ),
104
+            ),
105 105
         ),
106 106
         'default' => true,
107 107
         'width' => '10%',
108
-      ),
108
+        ),
109 109
       
110 110
     ),
111
-  ),
112
-  'templateMeta' => 
113
-  array (
111
+    ),
112
+    'templateMeta' => 
113
+    array (
114 114
     'maxColumns' => '3',
115 115
     'maxColumnsBasic' => '4', 
116 116
     'widths' => 
117 117
     array (
118
-      'label' => '10',
119
-      'field' => '30',
118
+        'label' => '10',
119
+        'field' => '30',
120
+    ),
120 121
     ),
121
-  ),
122 122
 );
123 123
 ?>
Please login to merge, or discard this patch.
modules/Meetings/metadata/SearchFields.php 1 patch
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -40,21 +40,21 @@  discard block
 block discarded – undo
40 40
 global $current_user;
41 41
 $module_name = "Meetings";
42 42
 $searchFields['Meetings'] = 
43
-	array (
44
-		'name' => array( 'query_type'=>'default'),
43
+    array (
44
+        'name' => array( 'query_type'=>'default'),
45 45
         'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
46 46
         'date_start' => array( 'query_type'=>'default'),
47 47
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
48 48
         'assigned_user_id'=> array('query_type'=>'default'),
49 49
         'status'=> array('query_type'=>'default', 'options' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
50 50
         
51
-		'open_only' => array(
52
-			'query_type'=>'default',
53
-			'db_field'=>array('status'),
54
-			'operator'=>'not in',
55
-			'closed_values' => array('Held', 'Not Held'),
56
-			'type'=>'bool',
57
-		),		
51
+        'open_only' => array(
52
+            'query_type'=>'default',
53
+            'db_field'=>array('status'),
54
+            'operator'=>'not in',
55
+            'closed_values' => array('Held', 'Not Held'),
56
+            'type'=>'bool',
57
+        ),		
58 58
         'favorites_only' => array(
59 59
             'query_type'=>'format',
60 60
             'operator' => 'subquery',
@@ -63,19 +63,19 @@  discard block
 block discarded – undo
63 63
 			                        and favorites.parent_type = "'.$module_name.'"
64 64
 			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
65 65
             'db_field'=>array('id')),
66
-		//Range Search Support
67
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
68
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
69
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
70
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
71
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
72
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
75
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
78
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
79
-	    //Range Search Support 				
80
-	);
66
+        //Range Search Support
67
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
68
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
69
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
70
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
71
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
72
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
73
+        'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
74
+        'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
75
+        'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
76
+        'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
77
+        'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
78
+        'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
79
+        //Range Search Support 				
80
+    );
81 81
 ?>
Please login to merge, or discard this patch.
modules/Meetings/metadata/detailviewdefs.php 1 patch
Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -39,56 +39,56 @@  discard block
 block discarded – undo
39 39
 
40 40
 $viewdefs ['Meetings'] = 
41 41
 array (
42
-  'DetailView' => 
43
-  array (
42
+    'DetailView' => 
43
+    array (
44 44
     'templateMeta' => 
45 45
     array (
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49
-      'form' => 
50
-      array (
49
+        'form' => 
50
+        array (
51 51
         'buttons' => 
52 52
         array (
53
-          0 => 'EDIT',
54
-          1 => 'DUPLICATE',
55
-          2 => 'DELETE',
56
-          3 => 
57
-          array (
53
+            0 => 'EDIT',
54
+            1 => 'DUPLICATE',
55
+            2 => 'DELETE',
56
+            3 => 
57
+            array (
58 58
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSaveAndNew" value="false">  <input type="hidden" name="status" value="">  <input type="hidden" name="isSaveFromDetailView" value="true">  <input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"   class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';" id="close_create_button" name="button"  value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}"  type="submit">{/if}',
59
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
60
-              'sugar_html' => array(
61
-                  'type' => 'submit',
62
-                  'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
63
-                  'htmlOptions' => array(
64
-                      'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
65
-                      'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
66
-                      'class' => 'button',
67
-                      'id' => 'close_create_button',
68
-                      'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';',
59
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
60
+                'sugar_html' => array(
61
+                    'type' => 'submit',
62
+                    'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
63
+                    'htmlOptions' => array(
64
+                        'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
65
+                        'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
66
+                        'class' => 'button',
67
+                        'id' => 'close_create_button',
68
+                        'onclick' => 'this.form.isSaveFromDetailView.value=true; this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isDuplicate.value=true;this.form.isSaveAndNew.value=true;this.form.return_action.value=\'EditView\'; this.form.isDuplicate.value=true;this.form.return_id.value=\'{$fields.id.value}\';',
69 69
 
70
-                  ),
71
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
72
-              ),
73
-          ),
74
-          4 => 
75
-          array (
70
+                    ),
71
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
72
+                ),
73
+            ),
74
+            4 => 
75
+            array (
76 76
             'customCode' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")} <input type="hidden" name="isSave" value="false">  <input title="{$APP.LBL_CLOSE_BUTTON_TITLE}"  accesskey="{$APP.LBL_CLOSE_BUTTON_KEY}"  class="button"  onclick="this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'"  id="close_button" name="button1"  value="{$APP.LBL_CLOSE_BUTTON_TITLE}"  type="submit">{/if}',
77
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
78
-              'sugar_html' => array(
79
-                  'type' => 'submit',
80
-                  'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
81
-                  'htmlOptions' => array(
82
-                      'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
83
-                      'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
84
-                      'class' => 'button',
85
-                      'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';',
86
-                      'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
87
-                      'id' => 'close_button',
88
-                  ),
89
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
90
-              ),
91
-          ),
77
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
78
+                'sugar_html' => array(
79
+                    'type' => 'submit',
80
+                    'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
81
+                    'htmlOptions' => array(
82
+                        'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
83
+                        'accesskey' => '{$APP.LBL_CLOSE_BUTTON_KEY}',
84
+                        'class' => 'button',
85
+                        'onclick' => 'this.form.status.value=\'Held\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Meetings\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\';',
86
+                        'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
87
+                        'id' => 'close_button',
88
+                    ),
89
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
90
+                ),
91
+            ),
92 92
         ),
93 93
         'hidden' => array(
94 94
             '<input type="hidden" name="isSaveAndNew">',
@@ -97,50 +97,50 @@  discard block
 block discarded – undo
97 97
             '<input type="hidden" name="isSave">',
98 98
         ),
99 99
         'headerTpl' => 'modules/Meetings/tpls/detailHeader.tpl',
100
-      ),
101
-      'maxColumns' => '2',
102
-      'widths' => 
103
-      array (
100
+        ),
101
+        'maxColumns' => '2',
102
+        'widths' => 
103
+        array (
104 104
         0 => 
105 105
         array (
106
-          'label' => '10',
107
-          'field' => '30',
106
+            'label' => '10',
107
+            'field' => '30',
108 108
         ),
109 109
         1 => 
110 110
         array (
111
-          'label' => '10',
112
-          'field' => '30',
111
+            'label' => '10',
112
+            'field' => '30',
113
+        ),
113 114
         ),
114
-      ),
115
-      'useTabs' => false,
115
+        'useTabs' => false,
116 116
     ),
117 117
     'panels' => 
118 118
     array (
119
-      'lbl_meeting_information' => 
120
-      array (
119
+        'lbl_meeting_information' => 
120
+        array (
121 121
         array (
122
-          array (
122
+            array (
123 123
             'name' => 'name',
124 124
             'label' => 'LBL_SUBJECT',
125
-          ),
126
-          'status',
125
+            ),
126
+            'status',
127 127
         ),
128 128
         array (
129
-          array (
129
+            array (
130 130
             'name' => 'date_start',
131 131
             'label' => 'LBL_DATE_TIME',
132
-          ),
132
+            ),
133 133
         ),
134 134
         array (
135
-          array (
135
+            array (
136 136
             'name' => 'duration',
137 137
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
138 138
             'label' => 'LBL_DURATION',
139
-          ),
140
-          array (
139
+            ),
140
+            array (
141 141
             'name' => 'parent_name',
142 142
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
143
-          ),
143
+            ),
144 144
         ),
145 145
         array (
146 146
 //          array(
@@ -148,38 +148,38 @@  discard block
 block discarded – undo
148 148
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
149 149
 //            'label' => 'LBL_REMINDER',
150 150
 //            ),
151
-          array(
151
+            array(
152 152
             'name' => 'reminders',
153 153
             'label' => 'LBL_REMINDERS',
154 154
             ),
155
-          'location',
155
+            'location',
156 156
         ),
157 157
         array (
158
-          'description',
158
+            'description',
159
+        ),
159 160
         ),
160
-      ),
161
-      'LBL_PANEL_ASSIGNMENT' => 
162
-      array (
161
+        'LBL_PANEL_ASSIGNMENT' => 
163 162
         array (
164
-          array (
163
+        array (
164
+            array (
165 165
             'name' => 'assigned_user_name',
166 166
             'label' => 'LBL_ASSIGNED_TO',
167
-          ),
168
-          array (
167
+            ),
168
+            array (
169 169
             'name' => 'date_modified',
170 170
             'label' => 'LBL_DATE_MODIFIED',
171 171
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
172
-          ),
172
+            ),
173 173
 
174 174
         ),
175 175
         array (
176
-          array (
176
+            array (
177 177
             'name' => 'date_entered',
178 178
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
179
-          ),
179
+            ),
180 180
         ),
181
-      ),
181
+        ),
182
+    ),
182 183
     ),
183
-  ),
184 184
 );
185 185
 ?>
Please login to merge, or discard this patch.
modules/Meetings/metadata/quickcreatedefs.php 1 patch
Indentation   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -39,119 +39,119 @@  discard block
 block discarded – undo
39 39
 
40 40
 $viewdefs ['Meetings'] =
41 41
 array (
42
-  'QuickCreate' =>
43
-  array (
42
+    'QuickCreate' =>
43
+    array (
44 44
     'templateMeta' =>
45 45
     array (
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49
-      'maxColumns' => '2',
50
-      'form' =>
51
-      array (
49
+        'maxColumns' => '2',
50
+        'form' =>
51
+        array (
52 52
         'hidden' =>
53 53
         array (
54
-           '<input type="hidden" name="isSaveAndNew" value="false">',
55
-           '<input type="hidden" name="is_ajax_call" value="1">',
54
+            '<input type="hidden" name="isSaveAndNew" value="false">',
55
+            '<input type="hidden" name="is_ajax_call" value="1">',
56 56
         ),
57 57
         'buttons' =>
58 58
         array (
59 59
 
60
-          array (
60
+            array (
61 61
             'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button" onclick="SUGAR.meetings.fill_invitees();this.form.action.value=\'Save\'; this.form.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}this.form.return_id.value=\'\'; {/if}return check_form(\'EditView\');" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
62
-          ),
63
-           'CANCEL',
62
+            ),
63
+            'CANCEL',
64 64
 
65
-          array (
65
+            array (
66 66
             'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" class="button" onclick="this.form.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();this.form.action.value=\'Save\';this.form.return_action.value=\'EditView\';this.form.return_module.value=\'{$smarty.request.return_module}\';return check_form(\'EditView\');" type="submit" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
67
-          ),
67
+            ),
68 68
 
69
-          array (
69
+            array (
70 70
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" accessKey="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_KEY}" class="button" onclick="SUGAR.meetings.fill_invitees(); this.form.status.value=\'Held\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Meetings\'; this.form.isDuplicate.value=true; this.form.isSaveAndNew.value=true; this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'; return check_form(\'EditView\');" type="submit" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
71
-          ),
71
+            ),
72
+        ),
72 73
         ),
73
-      ),
74
-      'widths' =>
75
-      array (
74
+        'widths' =>
75
+        array (
76 76
 
77 77
         array (
78
-          'label' => '10',
79
-          'field' => '30',
78
+            'label' => '10',
79
+            'field' => '30',
80 80
         ),
81 81
 
82 82
         array (
83
-          'label' => '10',
84
-          'field' => '30',
83
+            'label' => '10',
84
+            'field' => '30',
85
+        ),
85 86
         ),
86
-      ),
87
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
87
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
88 88
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
89 89
 <script>toggle_portal_flag();function toggle_portal_flag()  {literal} { {/literal} {$TOGGLE_JS} {literal} } {/literal} </script>',
90
-      'useTabs' => false,
90
+        'useTabs' => false,
91 91
     ),
92 92
     'panels' =>
93 93
     array (
94
-      'default' =>
95
-      array (
94
+        'default' =>
95
+        array (
96 96
 
97 97
         array (
98 98
 
99
-          array (
99
+            array (
100 100
             'name' => 'name',
101 101
             'displayParams' =>
102 102
             array (
103
-              'required' => true,
103
+                'required' => true,
104
+            ),
104 105
             ),
105
-          ),
106 106
 
107
-          array (
107
+            array (
108 108
             'name' => 'status',
109 109
             'fields' =>
110 110
             array (
111 111
 
112
-              array (
112
+                array (
113 113
                 'name' => 'status',
114
-              ),
114
+                ),
115
+            ),
115 116
             ),
116
-          ),
117 117
         ),
118 118
         array (
119 119
 
120
-          array (
120
+            array (
121 121
             'name' => 'date_start',
122 122
             'type' => 'datetimecombo',
123 123
             'displayParams' =>
124 124
             array (
125
-              'required' => true,
126
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
125
+                'required' => true,
126
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
127
+            ),
127 128
             ),
128
-          ),
129 129
 
130
-          array (
130
+            array (
131 131
             'name' => 'parent_name',
132 132
             'label' => 'LBL_LIST_RELATED_TO',
133
-          ),
133
+            ),
134 134
         ),
135 135
         
136 136
         array (
137
-          array (
137
+            array (
138 138
             'name' => 'date_end',
139 139
             'type' => 'datetimecombo',
140 140
             'displayParams' =>
141 141
             array (
142
-              'required' => true,
143
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
142
+                'required' => true,
143
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
144 144
             ),
145
-          ),
146
-          array (
145
+            ),
146
+            array (
147 147
             'name' => 'location',
148 148
             'comment' => 'Meeting location',
149 149
             'label' => 'LBL_LOCATION',
150
-          ),
150
+            ),
151 151
         ),
152 152
         
153 153
         array(        
154
-          array (
154
+            array (
155 155
             'name' => 'duration',
156 156
             'customCode' => '
157 157
                 @@FIELD@@
@@ -168,37 +168,37 @@  discard block
 block discarded – undo
168 168
                     {/literal}
169 169
                 </script>            
170 170
             ',
171
-          ),          
171
+            ),          
172 172
 //          array (
173 173
 //            'name' => 'reminder_time',
174 174
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
175 175
 //            'label' => 'LBL_REMINDER',
176 176
 //          ),
177
-              array (
178
-                  'name' => 'reminders',
179
-                  'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
180
-                  'label' => 'LBL_REMINDERS',
181
-              ),
182
-       ),
183
-
184
-         array (
185
-         	 array (
177
+                array (
178
+                    'name' => 'reminders',
179
+                    'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
180
+                    'label' => 'LBL_REMINDERS',
181
+                ),
182
+        ),
183
+
184
+            array (
185
+                array (
186 186
             'name' => 'assigned_user_name',
187 187
             'label' => 'LBL_ASSIGNED_TO_NAME',
188
-          ),
188
+            ),
189 189
 
190 190
         ),
191 191
 
192 192
         array (
193 193
 
194
-          array (
194
+            array (
195 195
             'name' => 'description',
196 196
             'comment' => 'Full text of the note',
197 197
             'label' => 'LBL_DESCRIPTION',
198
-          ),
198
+            ),
199 199
         ),
200
-      ),
200
+        ),
201
+    ),
201 202
     ),
202
-  ),
203 203
 );
204 204
 ?>
Please login to merge, or discard this patch.
modules/Meetings/metadata/listviewdefs.php 1 patch
Indentation   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 
40 40
 $listViewDefs ['Meetings'] = 
41 41
 array (
42
-  'SET_COMPLETE' => 
43
-  array (
42
+    'SET_COMPLETE' => 
43
+    array (
44 44
     'width' => '1%',
45 45
     'label' => 'LBL_LIST_CLOSE',
46 46
     'link' => true,
@@ -48,18 +48,18 @@  discard block
 block discarded – undo
48 48
     'default' => true,
49 49
     'related_fields' => 
50 50
     array (
51
-      0 => 'status',
51
+        0 => 'status',
52
+    ),
52 53
     ),
53
-  ),
54
-  'NAME' => 
55
-  array (
54
+    'NAME' => 
55
+    array (
56 56
     'width' => '40%',
57 57
     'label' => 'LBL_LIST_SUBJECT',
58 58
     'link' => true,
59 59
     'default' => true,
60
-  ),
61
-  'CONTACT_NAME' => 
62
-  array (
60
+    ),
61
+    'CONTACT_NAME' => 
62
+    array (
63 63
     'width' => '20%',
64 64
     'label' => 'LBL_LIST_CONTACT',
65 65
     'link' => true,
@@ -67,9 +67,9 @@  discard block
 block discarded – undo
67 67
     'module' => 'Contacts',
68 68
     'default' => true,
69 69
     'ACLTag' => 'CONTACT',
70
-  ),
71
-  'PARENT_NAME' => 
72
-  array (
70
+    ),
71
+    'PARENT_NAME' => 
72
+    array (
73 73
     'width' => '20%',
74 74
     'label' => 'LBL_LIST_RELATED_TO',
75 75
     'dynamic_module' => 'PARENT_TYPE',
@@ -80,47 +80,47 @@  discard block
 block discarded – undo
80 80
     'ACLTag' => 'PARENT',
81 81
     'related_fields' => 
82 82
     array (
83
-      0 => 'parent_id',
84
-      1 => 'parent_type',
83
+        0 => 'parent_id',
84
+        1 => 'parent_type',
85 85
     ),
86
-  ),
87
-  'DATE_START' => 
88
-  array (
86
+    ),
87
+    'DATE_START' => 
88
+    array (
89 89
     'width' => '15%',
90 90
     'label' => 'LBL_LIST_DATE',
91 91
     'link' => false,
92 92
     'default' => true,
93 93
     'related_fields' => 
94 94
     array (
95
-      0 => 'time_start',
95
+        0 => 'time_start',
96 96
     ),
97
-  ),
98
-  'ASSIGNED_USER_NAME' => 
99
-  array (
97
+    ),
98
+    'ASSIGNED_USER_NAME' => 
99
+    array (
100 100
     'width' => '2%',
101 101
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
102 102
     'module' => 'Employees',
103 103
     'id' => 'ASSIGNED_USER_ID',
104 104
     'default' => true,
105
-  ),
106
-  'DIRECTION' => 
107
-  array (
105
+    ),
106
+    'DIRECTION' => 
107
+    array (
108 108
     'type' => 'enum',
109 109
     'label' => 'LBL_LIST_DIRECTION',
110 110
     'width' => '10%',
111 111
     'default' => false,
112
-  ),
113
-  'STATUS' => 
114
-  array (
112
+    ),
113
+    'STATUS' => 
114
+    array (
115 115
     'width' => '10%',
116 116
     'label' => 'LBL_LIST_STATUS',
117 117
     'link' => false,
118 118
     'default' => false,
119
-  ),
120
-  'DATE_ENTERED' => array (
121
-	'width' => '10%',
122
-	'label' => 'LBL_DATE_ENTERED',
123
-	'default' => true
124
-  ),  
119
+    ),
120
+    'DATE_ENTERED' => array (
121
+    'width' => '10%',
122
+    'label' => 'LBL_DATE_ENTERED',
123
+    'default' => true
124
+    ),  
125 125
 );
126 126
 ?>
Please login to merge, or discard this patch.
modules/Meetings/views/view.edit.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -44,45 +44,45 @@
 block discarded – undo
44 44
 
45 45
 class MeetingsViewEdit extends ViewEdit
46 46
 {
47
- 	/**
48
- 	 * @see SugarView::preDisplay()
49
- 	 *
50
- 	 * Override preDisplay to check for presence of 'status' in $_REQUEST
51
- 	 * This is to support the "Close And Create New" operation.
52
- 	 */
53
- 	public function preDisplay()
54
- 	{
55
- 		if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
56
-	       $this->bean->status = 'Held';
57
- 		}
47
+        /**
48
+         * @see SugarView::preDisplay()
49
+         *
50
+         * Override preDisplay to check for presence of 'status' in $_REQUEST
51
+         * This is to support the "Close And Create New" operation.
52
+         */
53
+        public function preDisplay()
54
+        {
55
+            if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
56
+            $this->bean->status = 'Held';
57
+            }
58 58
 
59
- 		parent::preDisplay();
60
- 	}
59
+            parent::preDisplay();
60
+        }
61 61
 
62
- 	/**
63
- 	 * @see SugarView::display()
64
- 	 */
65
- 	public function display()
66
- 	{
67
- 		global $json;
62
+        /**
63
+         * @see SugarView::display()
64
+         */
65
+        public function display()
66
+        {
67
+            global $json;
68 68
         $json = getJSONobj();
69 69
         $json_config = new json_config();
70
-		if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
71
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
72
-		} else {
73
-			$this->bean->json_id = $this->bean->id;
74
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
75
-		}
76
- 		$this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
77
- 		if($this->ev->isDuplicate){
78
-	        $this->bean->status = $this->bean->getDefaultStatus();
79
- 		} //if
70
+        if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
71
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
72
+        } else {
73
+            $this->bean->json_id = $this->bean->id;
74
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
75
+        }
76
+            $this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
77
+            if($this->ev->isDuplicate){
78
+            $this->bean->status = $this->bean->getDefaultStatus();
79
+            } //if
80 80
 
81
-		$this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
82
-		$this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
83
-		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
84
-		$this->ss->assign('remindersDisabled', json_encode(false));
81
+        $this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
82
+        $this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
83
+        $this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
84
+        $this->ss->assign('remindersDisabled', json_encode(false));
85 85
 
86
- 		parent::display();
87
- 	}
86
+            parent::display();
87
+        }
88 88
 }
Please login to merge, or discard this patch.