Completed
Push — develop ( 0c0e51 )
by Adam
26:01 queued 12:43
created
modules/Meetings/MeetingsQuickCreate.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
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 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().')');
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
 
63 63
         
64
-        if($this->viaAJAX) { // override for ajax call
64
+        if ($this->viaAJAX) { // override for ajax call
65 65
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"meetingsQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"activities\"); else return false;'");
66 66
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_activities\")';");
67 67
         }
@@ -83,14 +83,14 @@  discard block
 block discarded – undo
83 83
 			$focus->duration_hours = "1";
84 84
 
85 85
         
86
-        $date_start_array=explode(" ",trim($focus->date_start));
87
-        if (count($date_start_array)==2) {
86
+        $date_start_array = explode(" ", trim($focus->date_start));
87
+        if (count($date_start_array) == 2) {
88 88
 			$focus->time_start = $timedate->to_db_time($date_start_array[1], false);
89 89
         	//$focus->date_start = $date_start_array[0];
90 90
         }
91 91
 
92 92
 		$this->ss->assign("DATE_START", $focus->date_start);
93
-		$this->ss->assign("TIME_START", substr($focus->time_start,0,5));
93
+		$this->ss->assign("TIME_START", substr($focus->time_start, 0, 5));
94 94
 		$time_start_hour = intval(substr($focus->time_start, 0, 2));
95 95
 		$time_start_minutes = substr($focus->time_start, 3, 5);
96 96
 		
@@ -110,12 +110,12 @@  discard block
 block discarded – undo
110 110
 		
111 111
 		
112 112
 		// We default the to assume that the time preference is set to 11:00 (i.e. without meridiem)
113
-		$hours_arr = array ();
113
+		$hours_arr = array();
114 114
 		$num_of_hours = 24;
115 115
 		$start_at = 0;
116 116
 
117 117
 		$time_pref = $timedate->get_time_format();
118
-		if(strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
118
+		if (strpos($time_pref, 'a') || strpos($time_pref, 'A')) {
119 119
 		   $num_of_hours = 13;
120 120
 		   $start_at = 1;	
121 121
 		} 
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 		}
129 129
 		*/
130 130
 		
131
-		for ($i = $start_at; $i < $num_of_hours; $i ++) {
131
+		for ($i = $start_at; $i < $num_of_hours; $i++) {
132 132
 			$i = $i."";
133 133
 			if (strlen($i) == 1) {
134 134
 				$i = "0".$i;
@@ -141,18 +141,18 @@  discard block
 block discarded – undo
141 141
 		$this->ss->assign("DURATION_HOURS", $focus->duration_hours);
142 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
-        if($num_of_hours == 13) {    
144
+        if ($num_of_hours == 13) {    
145 145
         		
146 146
 		   if (strpos($time_pref, 'a')) {
147 147
 		   	   
148
-               if(!isset($focus->meridiem_am_values)) {
148
+               if (!isset($focus->meridiem_am_values)) {
149 149
                   $focus->meridiem_am_values = array('am'=>'am', 'pm'=>'pm');
150 150
                } 		
151 151
                
152 152
                $this->ss->assign("TIME_MERIDIEM", get_select_options_with_id($focus->meridiem_am_values, $time_start_hour < 12 ? 'am' : 'pm'));
153 153
                
154 154
 		   } else {
155
-		       if(!isset($focus->meridiem_AM_values)) {
155
+		       if (!isset($focus->meridiem_AM_values)) {
156 156
 		          $focus->meridiem_AM_values = array('AM'=>'AM', 'PM'=>'PM');
157 157
 		       }
158 158
 		       
Please login to merge, or discard this patch.
modules/Meetings/SubPanelViewInvitees.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -79,14 +79,14 @@  discard block
 block discarded – undo
79 79
 
80 80
 // Stick the form header out there.
81 81
 echo get_form_header($mod_strings['LBL_INVITEE'], $button, false);
82
-$xtpl=new XTemplate ('modules/Meetings/SubPanelViewInvitees.html');
82
+$xtpl = new XTemplate('modules/Meetings/SubPanelViewInvitees.html');
83 83
 $xtpl->assign("MOD", $mod_strings);
84 84
 $xtpl->assign("APP", $app_strings);
85 85
 $xtpl->assign("RETURN_URL", "&return_module=$currentModule&return_action=DetailView&return_id=$focus->id");
86 86
 $xtpl->assign("MEETING_ID", $focus->id);
87 87
 
88 88
 $oddRow = true;
89
-foreach($focus_users_list as $user)
89
+foreach ($focus_users_list as $user)
90 90
 {
91 91
 	$user_fields = array(
92 92
 		'USER_NAME' => $user->user_name,
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 	$xtpl->assign("USER", $user_fields);
100 100
 
101
-	if($oddRow)
101
+	if ($oddRow)
102 102
     {
103 103
         //todo move to themes
104 104
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 $xtpl->out("users");
119 119
 
120 120
 $oddRow = true;
121
-foreach($focus_contacts_list as $contact)
121
+foreach ($focus_contacts_list as $contact)
122 122
 {
123 123
 	$contact_fields = array(
124 124
 		'FIRST_NAME' => $contact->first_name,
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 
132 132
 	$xtpl->assign("CONTACT", $contact_fields);
133 133
 
134
-	if($oddRow)
134
+	if ($oddRow)
135 135
     {
136 136
         //todo move to themes
137 137
 		$xtpl->assign("ROW_COLOR", 'oddListRow');
Please login to merge, or discard this patch.
modules/Meetings/metadata/additionalDetails.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 function additionalDetailsMeeting($fields) {
43 43
     global $timedate;
44 44
     static $mod_strings;
45
-    if(empty($mod_strings)) {
45
+    if (empty($mod_strings)) {
46 46
         global $current_language;
47 47
         $mod_strings = return_module_language($current_language, 'Meetings');
48 48
     }
@@ -50,51 +50,51 @@  discard block
 block discarded – undo
50 50
 //    print_r($fields);
51 51
     $overlib_string = '';
52 52
     $overlib_string .= '<input id="type" type="hidden" value="Meeting"/>';
53
-    if(!empty($fields['ID'])) {
54
-        $overlib_string .= '<input id="id" type="hidden" value="'. $fields['ID'];
53
+    if (!empty($fields['ID'])) {
54
+        $overlib_string .= '<input id="id" type="hidden" value="'.$fields['ID'];
55 55
         $overlib_string .= '"/>';
56 56
     }
57 57
 
58
-    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName=' . SugarThemeRegistry::current()->name .'&imageName=Meetings.gif"/> '.$mod_strings['LBL_MEETING'].'</h2>';
58
+    $overlib_string .= '<h2><img src="index.php?entryPoint=getImage&themeName='.SugarThemeRegistry::current()->name.'&imageName=Meetings.gif"/> '.$mod_strings['LBL_MEETING'].'</h2>';
59 59
 
60
-    if(!empty($fields['NAME'])) {
61
-        $overlib_string .= '<b>'.$mod_strings['LBL_SUBJECT'].'</b> <a href="index.php?action=DetailView&module=Meetings&record='.$fields['ID'].'">'. $fields['NAME'] . '</a>';
60
+    if (!empty($fields['NAME'])) {
61
+        $overlib_string .= '<b>'.$mod_strings['LBL_SUBJECT'].'</b> <a href="index.php?action=DetailView&module=Meetings&record='.$fields['ID'].'">'.$fields['NAME'].'</a>';
62 62
         $overlib_string .= '<br>';
63 63
     }
64
-    if(!empty($fields['DATE_START']))  {
64
+    if (!empty($fields['DATE_START'])) {
65 65
         // Make it easy to select for sorting in schedule bar
66 66
         $data_date = $timedate->fromUser($fields['DATE_START'])->format('Y-m-d H:i:s');
67 67
         $overlib_string .= '<span data-field="DATE_START" data-date="'.$data_date.'">';
68
-        $overlib_string .= '<b>'. $mod_strings['LBL_DATE_TIME'] . '</b> ' . $fields['DATE_START'] . ' <br>';
68
+        $overlib_string .= '<b>'.$mod_strings['LBL_DATE_TIME'].'</b> '.$fields['DATE_START'].' <br>';
69 69
         $overlib_string .= '</span>';
70 70
     }
71 71
 
72
-    if(isset($fields['DURATION_HOURS']) || isset($fields['DURATION_MINUTES'])) {
73
-        $overlib_string .= '<b>'. $mod_strings['LBL_DURATION'] . '</b> ';
74
-        if(isset($fields['DURATION_HOURS'])) {
75
-            $overlib_string .= $fields['DURATION_HOURS'] . $mod_strings['LBL_HOURS_ABBREV'] . ' ';
72
+    if (isset($fields['DURATION_HOURS']) || isset($fields['DURATION_MINUTES'])) {
73
+        $overlib_string .= '<b>'.$mod_strings['LBL_DURATION'].'</b> ';
74
+        if (isset($fields['DURATION_HOURS'])) {
75
+            $overlib_string .= $fields['DURATION_HOURS'].$mod_strings['LBL_HOURS_ABBREV'].' ';
76 76
         }
77
-        if(isset($fields['DURATION_MINUTES'])) {
78
-            $overlib_string .=  $fields['DURATION_MINUTES'] . $mod_strings['LBL_MINSS_ABBREV'];
77
+        if (isset($fields['DURATION_MINUTES'])) {
78
+            $overlib_string .= $fields['DURATION_MINUTES'].$mod_strings['LBL_MINSS_ABBREV'];
79 79
         }
80
-        $overlib_string .=  '<br>';
80
+        $overlib_string .= '<br>';
81 81
     }
82 82
     if (!empty($fields['PARENT_ID']))
83 83
     {
84
-        $overlib_string .= "<b>". $mod_strings['LBL_RELATED_TO'] . "</b> ".
84
+        $overlib_string .= "<b>".$mod_strings['LBL_RELATED_TO']."</b> ".
85 85
             "<a href='index.php?module=".$fields['PARENT_TYPE']."&action=DetailView&record=".$fields['PARENT_ID']."'>".
86
-            $fields['PARENT_TYPE'] .' - '. $fields['PARENT_NAME'] . "</a>";
86
+            $fields['PARENT_TYPE'].' - '.$fields['PARENT_NAME']."</a>";
87 87
         $overlib_string .= '<br>';
88 88
     }
89 89
 
90
-    if(!empty($fields['STATUS'])) {
91
-        $overlib_string .= '<b>'. $mod_strings['LBL_STATUS'] . '</b> ' . $fields['STATUS'];
90
+    if (!empty($fields['STATUS'])) {
91
+        $overlib_string .= '<b>'.$mod_strings['LBL_STATUS'].'</b> '.$fields['STATUS'];
92 92
         $overlib_string .= '<br>';
93 93
     }
94 94
 
95
-    if(!empty($fields['DESCRIPTION'])) {
96
-        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
97
-        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
95
+    if (!empty($fields['DESCRIPTION'])) {
96
+        $overlib_string .= '<b>'.$mod_strings['LBL_DESCRIPTION'].'</b> '.substr($fields['DESCRIPTION'], 0, 300);
97
+        if (strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
98 98
         $overlib_string .= '<br>';
99 99
     }
100 100
     $overlib_string .= '<br>';
Please login to merge, or discard this patch.
modules/Meetings/metadata/subpaneldefs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
             'sort_by' => 'date_entered',
79 79
             'title_key' => 'LBL_HISTORY_SUBPANEL_TITLE',
80 80
             'type' => 'collection',
81
-            'subpanel_name' => 'history',   //this values is not associated with a physical file.
81
+            'subpanel_name' => 'history', //this values is not associated with a physical file.
82 82
             'header_definition_from_subpanel' => 'meetings',
83 83
             'module' => 'History',
84 84
 
Please login to merge, or discard this patch.
modules/Meetings/metadata/editviewdefs.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -38,66 +38,66 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $viewdefs ['Meetings'] =
41
-array (
41
+array(
42 42
   'EditView' =>
43
-  array (
43
+  array(
44 44
     'templateMeta' =>
45
-    array (
45
+    array(
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49 49
       'maxColumns' => '2',
50 50
       'form' =>
51
-      array (
51
+      array(
52 52
         'hidden' =>
53
-        array (
53
+        array(
54 54
           0 => '<input type="hidden" name="isSaveAndNew" value="false">',
55 55
         ),
56 56
         'buttons' =>
57
-        array (
57
+        array(
58 58
           0 =>
59
-          array (
59
+          array(
60 60
 			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_HEADER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
61 61
 		  ),
62 62
           1 => 'CANCEL',
63 63
           2 =>
64
-          array (
64
+          array(
65 65
              'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_header" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
66 66
 		  ),
67 67
           3 => 
68
-          array (
68
+          array(
69 69
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_header" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
70 70
            ),
71 71
         ),
72 72
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
73 73
 
74 74
           'buttons_footer' =>
75
-        array (
75
+        array(
76 76
           0 =>
77
-          array (
77
+          array(
78 78
 			'customCode' => '<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" id ="SAVE_FOOTER" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\'; document.EditView.return_action.value=\'DetailView\'; {if isset($smarty.request.isDuplicate) && $smarty.request.isDuplicate eq "true"}document.EditView.return_id.value=\'\'; {/if} formSubmitCheck();"type="button" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">',
79 79
 		  ),
80 80
           1 => 'CANCEL',
81 81
           2 =>
82
-          array (
82
+          array(
83 83
              'customCode' => '<input title="{$MOD.LBL_SEND_BUTTON_TITLE}" id="save_and_send_invites_footer" class="button" onclick="document.EditView.send_invites.value=\'1\';SUGAR.meetings.fill_invitees();document.EditView.action.value=\'Save\';document.EditView.return_action.value=\'EditView\';document.EditView.return_module.value=\'{$smarty.request.return_module}\'; formSubmitCheck();"type="button" name="button" value="{$MOD.LBL_SEND_BUTTON_LABEL}">',
84 84
 		  ),
85 85
           3 =>
86
-          array (
86
+          array(
87 87
             'customCode' => '{if $fields.status.value != "Held"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" id="close_and_create_new_footer" class="button" onclick="SUGAR.meetings.fill_invitees(); document.EditView.status.value=\'Held\'; document.EditView.action.value=\'Save\'; document.EditView.return_module.value=\'Meetings\'; document.EditView.isDuplicate.value=true; document.EditView.isSaveAndNew.value=true; document.EditView.return_action.value=\'EditView\'; document.EditView.return_id.value=\'{$fields.id.value}\'; formSubmitCheck();"type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}',
88 88
            ),
89 89
         ),
90 90
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
91 91
       ),
92 92
       'widths' =>
93
-      array (
93
+      array(
94 94
         0 =>
95
-        array (
95
+        array(
96 96
           'label' => '10',
97 97
           'field' => '30',
98 98
         ),
99 99
         1 =>
100
-        array (
100
+        array(
101 101
           'label' => '10',
102 102
           'field' => '30',
103 103
         ),
@@ -109,19 +109,19 @@  discard block
 block discarded – undo
109 109
       'useTabs' => false,
110 110
     ),
111 111
     'panels' =>
112
-    array (
112
+    array(
113 113
       'lbl_meeting_information' =>
114
-      array (
115
-        array (
116
-          array (
114
+      array(
115
+        array(
116
+          array(
117 117
             'name' => 'name',
118 118
 
119 119
           ),
120
-          array (
120
+          array(
121 121
             'name' => 'status',
122 122
             'fields' =>
123
-            array (
124
-              array (
123
+            array(
124
+              array(
125 125
                 'name' => 'status',
126 126
               ),
127 127
             ),
@@ -129,36 +129,36 @@  discard block
 block discarded – undo
129 129
       ),
130 130
       
131 131
       
132
-      array (
133
-          array (
132
+      array(
133
+          array(
134 134
             'name' => 'date_start',
135 135
             'type' => 'datetimecombo',
136 136
             'displayParams' =>
137
-            array (
137
+            array(
138 138
               'required' => true,
139 139
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
140 140
             ),
141 141
           ),
142 142
           
143
-          array (
143
+          array(
144 144
             'name' => 'parent_name',
145 145
             'label' => 'LBL_LIST_RELATED_TO',
146 146
           ),
147 147
         ),
148 148
         
149 149
         
150
-      array (
151
-          array (
150
+      array(
151
+          array(
152 152
             'name' => 'date_end',
153 153
             'type' => 'datetimecombo',
154 154
             'displayParams' =>
155
-            array (
155
+            array(
156 156
               'required' => true,
157 157
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
158 158
             ),
159 159
           ),
160 160
           
161
-          array (
161
+          array(
162 162
             'name' => 'location',
163 163
             'comment' => 'Meeting location',
164 164
             'label' => 'LBL_LOCATION',
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
         ),      
167 167
         
168 168
         array(        
169
-          array (
169
+          array(
170 170
             'name' => 'duration',
171 171
             'customCode' => '
172 172
                 @@FIELD@@
@@ -194,14 +194,14 @@  discard block
 block discarded – undo
194 194
 //          ),
195 195
 //        ),
196 196
           array(
197
-              array (
197
+              array(
198 198
                   'name' => 'reminders',
199 199
                   'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
200 200
                   'label' => 'LBL_REMINDERS',
201 201
               ),
202 202
           ),
203
-        array (
204
-          array (
203
+        array(
204
+          array(
205 205
             'name' => 'description',
206 206
             'comment' => 'Full text of the note',
207 207
             'label' => 'LBL_DESCRIPTION',
@@ -209,9 +209,9 @@  discard block
 block discarded – undo
209 209
         ),
210 210
       ),
211 211
       'LBL_PANEL_ASSIGNMENT' =>
212
-      array (
213
-        array (
214
-          array (
212
+      array(
213
+        array(
214
+          array(
215 215
             'name' => 'assigned_user_name',
216 216
             'label' => 'LBL_ASSIGNED_TO_NAME',
217 217
           ),
Please login to merge, or discard this patch.
modules/Meetings/metadata/searchdefs.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -38,38 +38,38 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $searchdefs ['Meetings'] = 
41
-array (
41
+array(
42 42
   'layout' => 
43
-  array (
43
+  array(
44 44
     'basic_search' => 
45
-    array (
45
+    array(
46 46
       'name' => 
47
-      array (
47
+      array(
48 48
         'name' => 'name',
49 49
         'default' => true,
50 50
         'width' => '10%',
51 51
       ),
52 52
       'current_user_only' => 
53
-      array (
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 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',),
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
-    array (
64
+    array(
65 65
       'name' => 
66
-      array (
66
+      array(
67 67
         'name' => 'name',
68 68
         'default' => true,
69 69
         'width' => '10%',
70 70
       ),
71 71
       'parent_name' => 
72
-      array (
72
+      array(
73 73
         'type' => 'parent',
74 74
         'label' => 'LBL_LIST_RELATED_TO',
75 75
         'width' => '10%',
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
         'name' => 'parent_name',
78 78
       ),
79 79
       'current_user_only' => 
80
-      array (
80
+      array(
81 81
         'name' => 'current_user_only',
82 82
         'label' => 'LBL_CURRENT_USER_FILTER',
83 83
         'type' => 'bool',
@@ -85,21 +85,21 @@  discard block
 block discarded – undo
85 85
         'width' => '10%',
86 86
       ),
87 87
       'status' => 
88
-      array (
88
+      array(
89 89
         'name' => 'status',
90 90
         'default' => true,
91 91
         'width' => '10%',
92 92
       ),
93 93
       'assigned_user_id' => 
94
-      array (
94
+      array(
95 95
         'name' => 'assigned_user_id',
96 96
         'type' => 'enum',
97 97
         'label' => 'LBL_ASSIGNED_TO',
98 98
         'function' => 
99
-        array (
99
+        array(
100 100
           'name' => 'get_user_array',
101 101
           'params' => 
102
-          array (
102
+          array(
103 103
             0 => false,
104 104
           ),
105 105
         ),
@@ -110,11 +110,11 @@  discard block
 block discarded – undo
110 110
     ),
111 111
   ),
112 112
   'templateMeta' => 
113
-  array (
113
+  array(
114 114
     'maxColumns' => '3',
115 115
     'maxColumnsBasic' => '4', 
116 116
     'widths' => 
117
-    array (
117
+    array(
118 118
       'label' => '10',
119 119
       'field' => '30',
120 120
     ),
Please login to merge, or discard this patch.
modules/Meetings/metadata/SearchFields.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,11 +40,11 @@  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'),
45
-        'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
46
-        'date_start' => array( 'query_type'=>'default'),
47
-        'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
43
+	array(
44
+		'name' => array('query_type'=>'default'),
45
+        'contact_name' => array('query_type'=>'default', 'db_field'=>array('contacts.first_name', 'contacts.last_name')),        
46
+        'date_start' => array('query_type'=>'default'),
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
         
@@ -61,21 +61,21 @@  discard block
 block discarded – undo
61 61
             'subquery' => 'SELECT favorites.parent_id FROM favorites
62 62
 			                    WHERE favorites.deleted = 0
63 63
 			                        and favorites.parent_type = "'.$module_name.'"
64
-			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
64
+			                        and favorites.assigned_user_id = "' .$current_user->id.'") OR NOT ({0}',
65 65
             'db_field'=>array('id')),
66 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),	
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 79
 	    //Range Search Support 				
80 80
 	);
81 81
 ?>
Please login to merge, or discard this patch.
modules/Meetings/metadata/detailviewdefs.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -38,23 +38,23 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $viewdefs ['Meetings'] = 
41
-array (
41
+array(
42 42
   'DetailView' => 
43
-  array (
43
+  array(
44 44
     'templateMeta' => 
45
-    array (
45
+    array(
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49 49
       'form' => 
50
-      array (
50
+      array(
51 51
         'buttons' => 
52
-        array (
52
+        array(
53 53
           0 => 'EDIT',
54 54
           1 => 'DUPLICATE',
55 55
           2 => 'DELETE',
56 56
           3 => 
57
-          array (
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 59
               //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
60 60
               'sugar_html' => array(
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
               ),
73 73
           ),
74 74
           4 => 
75
-          array (
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 77
               //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
78 78
               'sugar_html' => array(
@@ -100,14 +100,14 @@  discard block
 block discarded – undo
100 100
       ),
101 101
       'maxColumns' => '2',
102 102
       'widths' => 
103
-      array (
103
+      array(
104 104
         0 => 
105
-        array (
105
+        array(
106 106
           'label' => '10',
107 107
           'field' => '30',
108 108
         ),
109 109
         1 => 
110
-        array (
110
+        array(
111 111
           'label' => '10',
112 112
           'field' => '30',
113 113
         ),
@@ -115,34 +115,34 @@  discard block
 block discarded – undo
115 115
       'useTabs' => false,
116 116
     ),
117 117
     'panels' => 
118
-    array (
118
+    array(
119 119
       'lbl_meeting_information' => 
120
-      array (
121
-        array (
122
-          array (
120
+      array(
121
+        array(
122
+          array(
123 123
             'name' => 'name',
124 124
             'label' => 'LBL_SUBJECT',
125 125
           ),
126 126
           'status',
127 127
         ),
128
-        array (
129
-          array (
128
+        array(
129
+          array(
130 130
             'name' => 'date_start',
131 131
             'label' => 'LBL_DATE_TIME',
132 132
           ),
133 133
         ),
134
-        array (
135
-          array (
134
+        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 139
           ),
140
-          array (
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
-        array (
145
+        array(
146 146
 //          array(
147 147
 //            'name' => 'reminder_time',
148 148
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
@@ -154,26 +154,26 @@  discard block
 block discarded – undo
154 154
             ),
155 155
           'location',
156 156
         ),
157
-        array (
157
+        array(
158 158
           'description',
159 159
         ),
160 160
       ),
161 161
       'LBL_PANEL_ASSIGNMENT' => 
162
-      array (
163
-        array (
164
-          array (
162
+      array(
163
+        array(
164
+          array(
165 165
             'name' => 'assigned_user_name',
166 166
             'label' => 'LBL_ASSIGNED_TO',
167 167
           ),
168
-          array (
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
-        array (
176
-          array (
175
+        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
           ),
Please login to merge, or discard this patch.
modules/Meetings/metadata/quickcreatedefs.php 1 patch
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -38,48 +38,48 @@  discard block
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 $viewdefs ['Meetings'] =
41
-array (
41
+array(
42 42
   'QuickCreate' =>
43
-  array (
43
+  array(
44 44
     'templateMeta' =>
45
-    array (
45
+    array(
46 46
         'includes' => array(
47 47
             array('file' => 'modules/Reminders/Reminders.js'),
48 48
         ),
49 49
       'maxColumns' => '2',
50 50
       'form' =>
51
-      array (
51
+      array(
52 52
         'hidden' =>
53
-        array (
53
+        array(
54 54
            '<input type="hidden" name="isSaveAndNew" value="false">',
55 55
            '<input type="hidden" name="is_ajax_call" value="1">',
56 56
         ),
57 57
         'buttons' =>
58
-        array (
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 62
           ),
63 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 74
       'widths' =>
75
-      array (
75
+      array(
76 76
 
77
-        array (
77
+        array(
78 78
           'label' => '10',
79 79
           'field' => '30',
80 80
         ),
81 81
 
82
-        array (
82
+        array(
83 83
           'label' => '10',
84 84
           'field' => '30',
85 85
         ),
@@ -90,60 +90,60 @@  discard block
 block discarded – undo
90 90
       'useTabs' => false,
91 91
     ),
92 92
     'panels' =>
93
-    array (
93
+    array(
94 94
       'default' =>
95
-      array (
95
+      array(
96 96
 
97
-        array (
97
+        array(
98 98
 
99
-          array (
99
+          array(
100 100
             'name' => 'name',
101 101
             'displayParams' =>
102
-            array (
102
+            array(
103 103
               'required' => true,
104 104
             ),
105 105
           ),
106 106
 
107
-          array (
107
+          array(
108 108
             'name' => 'status',
109 109
             'fields' =>
110
-            array (
110
+            array(
111 111
 
112
-              array (
112
+              array(
113 113
                 'name' => 'status',
114 114
               ),
115 115
             ),
116 116
           ),
117 117
         ),
118
-        array (
118
+        array(
119 119
 
120
-          array (
120
+          array(
121 121
             'name' => 'date_start',
122 122
             'type' => 'datetimecombo',
123 123
             'displayParams' =>
124
-            array (
124
+            array(
125 125
               'required' => true,
126 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
-        array (
137
-          array (
136
+        array(
137
+          array(
138 138
             'name' => 'date_end',
139 139
             'type' => 'datetimecombo',
140 140
             'displayParams' =>
141
-            array (
141
+            array(
142 142
               'required' => true,
143 143
               'updateCallback' => 'SugarWidgetScheduler.update_time();',
144 144
             ),
145 145
           ),
146
-          array (
146
+          array(
147 147
             'name' => 'location',
148 148
             'comment' => 'Meeting location',
149 149
             'label' => 'LBL_LOCATION',
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
         ),
152 152
         
153 153
         array(        
154
-          array (
154
+          array(
155 155
             'name' => 'duration',
156 156
             'customCode' => '
157 157
                 @@FIELD@@
@@ -174,24 +174,24 @@  discard block
 block discarded – undo
174 174
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
175 175
 //            'label' => 'LBL_REMINDER',
176 176
 //          ),
177
-              array (
177
+              array(
178 178
                   'name' => 'reminders',
179 179
                   'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
180 180
                   'label' => 'LBL_REMINDERS',
181 181
               ),
182 182
        ),
183 183
 
184
-         array (
185
-         	 array (
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
-        array (
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',
Please login to merge, or discard this patch.