adamjakab / SuiteCRM

modules/Meetings/SubPanelViewInvitees.php

Indentation +27 added lines, -27 removed lines

@@ -88,29 +88,29 @@ 
 $oddRow = true;
 foreach($focus_users_list as $user)
 {
-	$user_fields = array(
-		'USER_NAME' => $user->user_name,
-		'FULL_NAME' => $locale->getLocaleFormattedName($user->first_name, $user->last_name),
-		'ID' => $user->id,
-		'EMAIL' => $user->email1,
-		'PHONE_WORK' => $user->phone_work
-	);
+    $user_fields = array(
+        'USER_NAME' => $user->user_name,
+        'FULL_NAME' => $locale->getLocaleFormattedName($user->first_name, $user->last_name),
+        'ID' => $user->id,
+        'EMAIL' => $user->email1,
+        'PHONE_WORK' => $user->phone_work
+    );
 
-	$xtpl->assign("USER", $user_fields);
+    $xtpl->assign("USER", $user_fields);
 
-	if($oddRow)
+    if($oddRow)
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'oddListRow');
+        $xtpl->assign("ROW_COLOR", 'oddListRow');
     }
     else
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'evenListRow');
+        $xtpl->assign("ROW_COLOR", 'evenListRow');
     }
     $oddRow = !$oddRow;
 
-	$xtpl->parse("users.row");
+    $xtpl->parse("users.row");
 // Put the rows in.
 }
 
@@ -120,30 +120,30 @@ 
 $oddRow = true;
 foreach($focus_contacts_list as $contact)
 {
-	$contact_fields = array(
-		'FIRST_NAME' => $contact->first_name,
-		'LAST_NAME' => $contact->last_name,
-		'ACCOUNT_NAME' => $contact->account_name,
-		'ID' => $contact->id,
-		'EMAIL' => $contact->email1,
-		'PHONE_WORK' => $contact->phone_work
-	);
-
-	$xtpl->assign("CONTACT", $contact_fields);
-
-	if($oddRow)
+    $contact_fields = array(
+        'FIRST_NAME' => $contact->first_name,
+        'LAST_NAME' => $contact->last_name,
+        'ACCOUNT_NAME' => $contact->account_name,
+        'ID' => $contact->id,
+        'EMAIL' => $contact->email1,
+        'PHONE_WORK' => $contact->phone_work
+    );
+
+    $xtpl->assign("CONTACT", $contact_fields);
+
+    if($oddRow)
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'oddListRow');
+        $xtpl->assign("ROW_COLOR", 'oddListRow');
     }
     else
     {
         //todo move to themes
-		$xtpl->assign("ROW_COLOR", 'evenListRow');
+        $xtpl->assign("ROW_COLOR", 'evenListRow');
     }
     $oddRow = !$oddRow;
 
-	$xtpl->parse("contacts.row");
+    $xtpl->parse("contacts.row");
 // Put the rows in.
 }
 

modules/Meetings/metadata/editviewdefs.php

Indentation +82 added lines, -82 removed lines

@@ -39,134 +39,134 @@ 
 
 $viewdefs ['Meetings'] =
 array (
-  'EditView' =>
-  array (
+    'EditView' =>
+    array (
     'templateMeta' =>
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'maxColumns' => '2',
-      'form' =>
-      array (
+        'maxColumns' => '2',
+        'form' =>
+        array (
         'hidden' =>
         array (
-          0 => '<input type="hidden" name="isSaveAndNew" value="false">',
+            0 => '<input type="hidden" name="isSaveAndNew" value="false">',
         ),
         'buttons' =>
         array (
-          0 =>
-          array (
-			'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}">',
-		  ),
-          1 => 'CANCEL',
-          2 =>
-          array (
-             '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}">',
-		  ),
-          3 => 
-          array (
+            0 =>
+            array (
+            '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}">',
+            ),
+            1 => 'CANCEL',
+            2 =>
+            array (
+                '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}">',
+            ),
+            3 => 
+            array (
             '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}',
-           ),
+            ),
         ),
         'headerTpl' => 'modules/Meetings/tpls/header.tpl',
 
-          'buttons_footer' =>
+            'buttons_footer' =>
         array (
-          0 =>
-          array (
-			'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}">',
-		  ),
-          1 => 'CANCEL',
-          2 =>
-          array (
-             '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}">',
-		  ),
-          3 =>
-          array (
+            0 =>
+            array (
+            '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}">',
+            ),
+            1 => 'CANCEL',
+            2 =>
+            array (
+                '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}">',
+            ),
+            3 =>
+            array (
             '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}',
-           ),
+            ),
         ),
         'footerTpl' => 'modules/Meetings/tpls/footer.tpl',
-      ),
-      'widths' =>
-      array (
+        ),
+        'widths' =>
+        array (
         0 =>
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 =>
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
 <script>toggle_portal_flag();function toggle_portal_flag()  {ldelim} {$TOGGLE_JS} {rdelim} 
 function formSubmitCheck(){ldelim}if(check_form(\'EditView\')){ldelim}document.EditView.submit();{rdelim}{rdelim}</script>',
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' =>
     array (
-      'lbl_meeting_information' =>
-      array (
+        'lbl_meeting_information' =>
         array (
-          array (
+        array (
+            array (
             'name' => 'name',
 
-          ),
-          array (
+            ),
+            array (
             'name' => 'status',
             'fields' =>
             array (
-              array (
+                array (
                 'name' => 'status',
-              ),
+                ),
+            ),
             ),
-         ),
-      ),
+        ),
       
       
-      array (
-          array (
+        array (
+            array (
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
+            ),
             ),
-          ),
           
-          array (
+            array (
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
-          ),
+            ),
         ),
         
         
-      array (
-          array (
+        array (
+            array (
             'name' => 'date_end',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
+            ),
             ),
-          ),
           
-          array (
+            array (
             'name' => 'location',
             'comment' => 'Meeting location',
             'label' => 'LBL_LOCATION',
-          ),
+            ),
         ),      
         
         array(        
-          array (
+            array (
             'name' => 'duration',
             'customCode' => '
                 @@FIELD@@
@@ -184,7 +184,7 @@ 
                 </script>            
             ',
             'customCodeReadOnly' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
-          ),
+            ),
         ),
 //        array (
 //          array (
@@ -193,31 +193,31 @@ 
 //            'label' => 'LBL_REMINDER',
 //          ),
 //        ),
-          array(
-              array (
-                  'name' => 'reminders',
-                  'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
-                  'label' => 'LBL_REMINDERS',
-              ),
-          ),
+            array(
+                array (
+                    'name' => 'reminders',
+                    'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
+                    'label' => 'LBL_REMINDERS',
+                ),
+            ),
         array (
-          array (
+            array (
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' =>
-      array (
+        'LBL_PANEL_ASSIGNMENT' =>
         array (
-          array (
+        array (
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

modules/Meetings/metadata/searchdefs.php

Indentation +35 added lines, -35 removed lines

@@ -39,85 +39,85 @@
 
 $searchdefs ['Meetings'] = 
 array (
-  'layout' => 
-  array (
+    'layout' => 
+    array (
     'basic_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'current_user_only' => 
-      array (
+        ),
+        'current_user_only' => 
+        array (
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
-      ),
-      array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
-      array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
+        ),
+        array ('name' => 'open_only', 'label' => 'LBL_OPEN_ITEMS', 'type' => 'bool', 'default' => false, 'width' => '10%'),
+        array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
     ),
     'advanced_search' => 
     array (
-      'name' => 
-      array (
+        'name' => 
+        array (
         'name' => 'name',
         'default' => true,
         'width' => '10%',
-      ),
-      'parent_name' => 
-      array (
+        ),
+        'parent_name' => 
+        array (
         'type' => 'parent',
         'label' => 'LBL_LIST_RELATED_TO',
         'width' => '10%',
         'default' => true,
         'name' => 'parent_name',
-      ),
-      'current_user_only' => 
-      array (
+        ),
+        'current_user_only' => 
+        array (
         'name' => 'current_user_only',
         'label' => 'LBL_CURRENT_USER_FILTER',
         'type' => 'bool',
         'default' => true,
         'width' => '10%',
-      ),
-      'status' => 
-      array (
+        ),
+        'status' => 
+        array (
         'name' => 'status',
         'default' => true,
         'width' => '10%',
-      ),
-      'assigned_user_id' => 
-      array (
+        ),
+        'assigned_user_id' => 
+        array (
         'name' => 'assigned_user_id',
         'type' => 'enum',
         'label' => 'LBL_ASSIGNED_TO',
         'function' => 
         array (
-          'name' => 'get_user_array',
-          'params' => 
-          array (
+            'name' => 'get_user_array',
+            'params' => 
+            array (
             0 => false,
-          ),
+            ),
         ),
         'default' => true,
         'width' => '10%',
-      ),
+        ),
       
     ),
-  ),
-  'templateMeta' => 
-  array (
+    ),
+    'templateMeta' => 
+    array (
     'maxColumns' => '3',
     'maxColumnsBasic' => '4', 
     'widths' => 
     array (
-      'label' => '10',
-      'field' => '30',
+        'label' => '10',
+        'field' => '30',
+    ),
     ),
-  ),
 );
 ?>

modules/Meetings/metadata/SearchFields.php

Indentation +24 added lines, -24 removed lines

@@ -40,21 +40,21 @@ 
 global $current_user;
 $module_name = "Meetings";
 $searchFields['Meetings'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
+    array (
+        'name' => array( 'query_type'=>'default'),
         'contact_name' => array( 'query_type'=>'default','db_field'=>array('contacts.first_name','contacts.last_name')),        
         'date_start' => array( 'query_type'=>'default'),
         'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'),
         'assigned_user_id'=> array('query_type'=>'default'),
         'status'=> array('query_type'=>'default', 'options' => 'meeting_status_dom', 'template_var' => 'STATUS_FILTER'),
         
-		'open_only' => array(
-			'query_type'=>'default',
-			'db_field'=>array('status'),
-			'operator'=>'not in',
-			'closed_values' => array('Held', 'Not Held'),
-			'type'=>'bool',
-		),		
+        'open_only' => array(
+            'query_type'=>'default',
+            'db_field'=>array('status'),
+            'operator'=>'not in',
+            'closed_values' => array('Held', 'Not Held'),
+            'type'=>'bool',
+        ),		
         'favorites_only' => array(
             'query_type'=>'format',
             'operator' => 'subquery',
@@ -63,19 +63,19 @@ 
 			                        and favorites.parent_type = "'.$module_name.'"
 			                        and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}',
             'db_field'=>array('id')),
-		//Range Search Support
-	   'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-	   'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
-	   'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
-       'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
-	    //Range Search Support 				
-	);
+        //Range Search Support
+        'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_entered' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_modified' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_start' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_start' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),
+        'start_range_date_end' => array ('query_type' => 'default',  'enable_range_search' => true, 'is_date_field' => true),
+        'end_range_date_end' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true),	
+        //Range Search Support 				
+    );
 ?>

modules/Meetings/metadata/detailviewdefs.php

Indentation +75 added lines, -75 removed lines

@@ -39,56 +39,56 @@ 
 
 $viewdefs ['Meetings'] = 
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 'EDIT',
-          1 => 'DUPLICATE',
-          2 => 'DELETE',
-          3 => 
-          array (
+            0 => 'EDIT',
+            1 => 'DUPLICATE',
+            2 => 'DELETE',
+            3 => 
+            array (
             '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}',
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
-              'sugar_html' => array(
-                  'type' => 'submit',
-                  'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-                  'htmlOptions' => array(
-                      'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-                      'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
-                      'class' => 'button',
-                      'id' => 'close_create_button',
-                      '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}\';',
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
+                'sugar_html' => array(
+                    'type' => 'submit',
+                    'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                    'htmlOptions' => array(
+                        'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                        'name' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}',
+                        'class' => 'button',
+                        'id' => 'close_create_button',
+                        '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}\';',
 
-                  ),
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
-              ),
-          ),
-          4 => 
-          array (
+                    ),
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+                ),
+            ),
+            4 => 
+            array (
             '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}',
-              //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
-              'sugar_html' => array(
-                  'type' => 'submit',
-                  'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
-                  'htmlOptions' => array(
-                      '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}\';',
-                      'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
-                      'id' => 'close_button',
-                  ),
-                  'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
-              ),
-          ),
+                //Bug#51778: The custom code will be replaced with sugar_html. customCode will be deplicated.
+                'sugar_html' => array(
+                    'type' => 'submit',
+                    'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
+                    'htmlOptions' => array(
+                        '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}\';',
+                        'name' => '{$APP.LBL_CLOSE_BUTTON_TITLE}',
+                        'id' => 'close_button',
+                    ),
+                    'template' => '{if $fields.status.value != "Held" && $bean->aclAccess("edit")}[CONTENT]{/if}',
+                ),
+            ),
         ),
         'hidden' => array(
             '<input type="hidden" name="isSaveAndNew">',
@@ -97,50 +97,50 @@ 
             '<input type="hidden" name="isSave">',
         ),
         'headerTpl' => 'modules/Meetings/tpls/detailHeader.tpl',
-      ),
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        ),
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' => 
     array (
-      'lbl_meeting_information' => 
-      array (
+        'lbl_meeting_information' => 
+        array (
         array (
-          array (
+            array (
             'name' => 'name',
             'label' => 'LBL_SUBJECT',
-          ),
-          'status',
+            ),
+            'status',
         ),
         array (
-          array (
+            array (
             'name' => 'date_start',
             'label' => 'LBL_DATE_TIME',
-          ),
+            ),
         ),
         array (
-          array (
+            array (
             'name' => 'duration',
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
             'label' => 'LBL_DURATION',
-          ),
-          array (
+            ),
+            array (
             'name' => 'parent_name',
             'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}',
-          ),
+            ),
         ),
         array (
 //          array(
@@ -148,38 +148,38 @@ 
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
 //            'label' => 'LBL_REMINDER',
 //            ),
-          array(
+            array(
             'name' => 'reminders',
             'label' => 'LBL_REMINDERS',
             ),
-          'location',
+            'location',
         ),
         array (
-          'description',
+            'description',
+        ),
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        'LBL_PANEL_ASSIGNMENT' => 
         array (
-          array (
+        array (
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
-          array (
+            ),
+            array (
             'name' => 'date_modified',
             'label' => 'LBL_DATE_MODIFIED',
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
-          ),
+            ),
 
         ),
         array (
-          array (
+            array (
             'name' => 'date_entered',
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

modules/Meetings/metadata/quickcreatedefs.php

Indentation +61 added lines, -61 removed lines

@@ -39,119 +39,119 @@ 
 
 $viewdefs ['Meetings'] =
 array (
-  'QuickCreate' =>
-  array (
+    'QuickCreate' =>
+    array (
     'templateMeta' =>
     array (
         'includes' => array(
             array('file' => 'modules/Reminders/Reminders.js'),
         ),
-      'maxColumns' => '2',
-      'form' =>
-      array (
+        'maxColumns' => '2',
+        'form' =>
+        array (
         'hidden' =>
         array (
-           '<input type="hidden" name="isSaveAndNew" value="false">',
-           '<input type="hidden" name="is_ajax_call" value="1">',
+            '<input type="hidden" name="isSaveAndNew" value="false">',
+            '<input type="hidden" name="is_ajax_call" value="1">',
         ),
         'buttons' =>
         array (
 
-          array (
+            array (
             '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}">',
-          ),
-           'CANCEL',
+            ),
+            'CANCEL',
 
-          array (
+            array (
             '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}">',
-          ),
+            ),
 
-          array (
+            array (
             '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}',
-          ),
+            ),
+        ),
         ),
-      ),
-      'widths' =>
-      array (
+        'widths' =>
+        array (
 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
+        'javascript' => '<script type="text/javascript">{$JSON_CONFIG_JAVASCRIPT}</script>
 {sugar_getscript file="cache/include/javascript/sugar_grp_jsolait.js"}
 <script>toggle_portal_flag();function toggle_portal_flag()  {literal} { {/literal} {$TOGGLE_JS} {literal} } {/literal} </script>',
-      'useTabs' => false,
+        'useTabs' => false,
     ),
     'panels' =>
     array (
-      'default' =>
-      array (
+        'default' =>
+        array (
 
         array (
 
-          array (
+            array (
             'name' => 'name',
             'displayParams' =>
             array (
-              'required' => true,
+                'required' => true,
+            ),
             ),
-          ),
 
-          array (
+            array (
             'name' => 'status',
             'fields' =>
             array (
 
-              array (
+                array (
                 'name' => 'status',
-              ),
+                ),
+            ),
             ),
-          ),
         ),
         array (
 
-          array (
+            array (
             'name' => 'date_start',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
+            ),
             ),
-          ),
 
-          array (
+            array (
             'name' => 'parent_name',
             'label' => 'LBL_LIST_RELATED_TO',
-          ),
+            ),
         ),
         
         array (
-          array (
+            array (
             'name' => 'date_end',
             'type' => 'datetimecombo',
             'displayParams' =>
             array (
-              'required' => true,
-              'updateCallback' => 'SugarWidgetScheduler.update_time();',
+                'required' => true,
+                'updateCallback' => 'SugarWidgetScheduler.update_time();',
             ),
-          ),
-          array (
+            ),
+            array (
             'name' => 'location',
             'comment' => 'Meeting location',
             'label' => 'LBL_LOCATION',
-          ),
+            ),
         ),
         
         array(        
-          array (
+            array (
             'name' => 'duration',
             'customCode' => '
                 @@FIELD@@
@@ -168,37 +168,37 @@ 
                     {/literal}
                 </script>            
             ',
-          ),          
+            ),          
 //          array (
 //            'name' => 'reminder_time',
 //            'customCode' => '{include file="modules/Meetings/tpls/reminders.tpl"}',
 //            'label' => 'LBL_REMINDER',
 //          ),
-              array (
-                  'name' => 'reminders',
-                  'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
-                  'label' => 'LBL_REMINDERS',
-              ),
-       ),
-
-         array (
-         	 array (
+                array (
+                    'name' => 'reminders',
+                    'customCode' => '{include file="modules/Reminders/tpls/reminders.tpl"}',
+                    'label' => 'LBL_REMINDERS',
+                ),
+        ),
+
+            array (
+                array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO_NAME',
-          ),
+            ),
 
         ),
 
         array (
 
-          array (
+            array (
             'name' => 'description',
             'comment' => 'Full text of the note',
             'label' => 'LBL_DESCRIPTION',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

modules/Meetings/metadata/listviewdefs.php

Indentation +33 added lines, -33 removed lines

@@ -39,8 +39,8 @@ 
 
 $listViewDefs ['Meetings'] = 
 array (
-  'SET_COMPLETE' => 
-  array (
+    'SET_COMPLETE' => 
+    array (
     'width' => '1%',
     'label' => 'LBL_LIST_CLOSE',
     'link' => true,
@@ -48,18 +48,18 @@ 
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'status',
+        0 => 'status',
+    ),
     ),
-  ),
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '40%',
     'label' => 'LBL_LIST_SUBJECT',
     'link' => true,
     'default' => true,
-  ),
-  'CONTACT_NAME' => 
-  array (
+    ),
+    'CONTACT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_CONTACT',
     'link' => true,
@@ -67,9 +67,9 @@ 
     'module' => 'Contacts',
     'default' => true,
     'ACLTag' => 'CONTACT',
-  ),
-  'PARENT_NAME' => 
-  array (
+    ),
+    'PARENT_NAME' => 
+    array (
     'width' => '20%',
     'label' => 'LBL_LIST_RELATED_TO',
     'dynamic_module' => 'PARENT_TYPE',
@@ -80,47 +80,47 @@ 
     'ACLTag' => 'PARENT',
     'related_fields' => 
     array (
-      0 => 'parent_id',
-      1 => 'parent_type',
+        0 => 'parent_id',
+        1 => 'parent_type',
     ),
-  ),
-  'DATE_START' => 
-  array (
+    ),
+    'DATE_START' => 
+    array (
     'width' => '15%',
     'label' => 'LBL_LIST_DATE',
     'link' => false,
     'default' => true,
     'related_fields' => 
     array (
-      0 => 'time_start',
+        0 => 'time_start',
     ),
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    ),
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '2%',
     'label' => 'LBL_LIST_ASSIGNED_TO_NAME',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'DIRECTION' => 
-  array (
+    ),
+    'DIRECTION' => 
+    array (
     'type' => 'enum',
     'label' => 'LBL_LIST_DIRECTION',
     'width' => '10%',
     'default' => false,
-  ),
-  'STATUS' => 
-  array (
+    ),
+    'STATUS' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LIST_STATUS',
     'link' => false,
     'default' => false,
-  ),
-  'DATE_ENTERED' => array (
-	'width' => '10%',
-	'label' => 'LBL_DATE_ENTERED',
-	'default' => true
-  ),  
+    ),
+    'DATE_ENTERED' => array (
+    'width' => '10%',
+    'label' => 'LBL_DATE_ENTERED',
+    'default' => true
+    ),  
 );
 ?>

modules/Meetings/views/view.edit.php

Indentation +35 added lines, -35 removed lines

@@ -44,45 +44,45 @@
 
 class MeetingsViewEdit extends ViewEdit
 {
- 	/**
- 	 * @see SugarView::preDisplay()
- 	 *
- 	 * Override preDisplay to check for presence of 'status' in $_REQUEST
- 	 * This is to support the "Close And Create New" operation.
- 	 */
- 	public function preDisplay()
- 	{
- 		if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
-	       $this->bean->status = 'Held';
- 		}
+        /**
+         * @see SugarView::preDisplay()
+         *
+         * Override preDisplay to check for presence of 'status' in $_REQUEST
+         * This is to support the "Close And Create New" operation.
+         */
+        public function preDisplay()
+        {
+            if(!empty($_REQUEST['status']) && ($_REQUEST['status'] == 'Held')) {
+            $this->bean->status = 'Held';
+            }
 
- 		parent::preDisplay();
- 	}
+            parent::preDisplay();
+        }
 
- 	/**
- 	 * @see SugarView::display()
- 	 */
- 	public function display()
- 	{
- 		global $json;
+        /**
+         * @see SugarView::display()
+         */
+        public function display()
+        {
+            global $json;
         $json = getJSONobj();
         $json_config = new json_config();
-		if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
-		} else {
-			$this->bean->json_id = $this->bean->id;
-			$javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
-		}
- 		$this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
- 		if($this->ev->isDuplicate){
-	        $this->bean->status = $this->bean->getDefaultStatus();
- 		} //if
+        if (isset($this->bean->json_id) && !empty ($this->bean->json_id)) {
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->json_id);
+        } else {
+            $this->bean->json_id = $this->bean->id;
+            $javascript = $json_config->get_static_json_server(false, true, 'Meetings', $this->bean->id);
+        }
+            $this->ss->assign('JSON_CONFIG_JAVASCRIPT', $javascript);
+            if($this->ev->isDuplicate){
+            $this->bean->status = $this->bean->getDefaultStatus();
+            } //if
 
-		$this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
-		$this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
-		$this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
-		$this->ss->assign('remindersDisabled', json_encode(false));
+        $this->ss->assign('remindersData', Reminder::loadRemindersData('Meetings', $this->bean->id, $this->ev->isDuplicate));
+        $this->ss->assign('remindersDataJson', Reminder::loadRemindersDataJson('Meetings', $this->bean->id, $this->ev->isDuplicate));
+        $this->ss->assign('remindersDefaultValuesDataJson', Reminder::loadRemindersDefaultValuesDataJson());
+        $this->ss->assign('remindersDisabled', json_encode(false));
 
- 		parent::display();
- 	}
+            parent::display();
+        }
 }

modules/ModuleBuilder/action_view_map.php

Indentation +19 added lines, -19 removed lines

@@ -43,28 +43,28 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
- //format '<action_name>' => '<view_name>',
- $action_view_map = array(
- 						'index' => 'main',
- 						'module'=>'module',
- 						'modulefields'=>'modulefields',
- 						'modulelabels'=>'modulelabels',
- 						'relationships'=>'relationships',
- 						'relationship'=>'relationship',
+    //format '<action_name>' => '<view_name>',
+    $action_view_map = array(
+                            'index' => 'main',
+                            'module'=>'module',
+                            'modulefields'=>'modulefields',
+                            'modulelabels'=>'modulelabels',
+                            'relationships'=>'relationships',
+                            'relationship'=>'relationship',
                         'resetmodule'=>'resetmodule',
- 						'modulefield'=>'modulefield',
- 						'displaydeploy'=>'displaydeploy',
- 						'package'=>'package',
- 						'dropdown'=>'dropdown',
- 						'dropdowns'=>'dropdowns',
- 						'detailview' => 'detail',
- 						'editview' => 'edit',
- 						'popup' => 'popup',
- 						'home'=>'home',
+                            'modulefield'=>'modulefield',
+                            'displaydeploy'=>'displaydeploy',
+                            'package'=>'package',
+                            'dropdown'=>'dropdown',
+                            'dropdowns'=>'dropdowns',
+                            'detailview' => 'detail',
+                            'editview' => 'edit',
+                            'popup' => 'popup',
+                            'home'=>'home',
                         'visibilityeditor' => 'visibilityeditor',
- 						'exportcustomizations'=>'exportcustomizations',
+                            'exportcustomizations'=>'exportcustomizations',
 
- 					);
+                        );
     // add those we need from the global action_view_map
     $action_view_map['dc'] = 'dc';
     $action_view_map['dcajax'] = 'dcajax';