Completed
Push — develop ( 7c1bda...edae1e )
by Adam
18:38 queued 03:14
created
modules/Project/metadata/listviewdefs.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -43,48 +43,48 @@
 block discarded – undo
43 43
 
44 44
 $listViewDefs ['Project'] =
45 45
 array (
46
-  'NAME' => 
47
-  array (
46
+    'NAME' => 
47
+    array (
48 48
     'width' => '25%',
49 49
     'label' => 'LBL_LIST_NAME',
50 50
     'link' => true,
51 51
     'default' => true,
52
-  ),
53
-  'PRIORITY' => 
54
-  array (
52
+    ),
53
+    'PRIORITY' => 
54
+    array (
55 55
     'type' => 'enum',
56 56
     'label' => 'LBL_PRIORITY',
57 57
     'width' => '10%',
58 58
     'default' => true,
59
-  ),
60
-  'STATUS' => 
61
-  array (
59
+    ),
60
+    'STATUS' => 
61
+    array (
62 62
     'width' => '10%',
63 63
     'label' => 'LBL_STATUS',
64 64
     'link' => false,
65 65
     'default' => true,
66
-  ),
67
-  'ESTIMATED_START_DATE' => 
68
-  array (
66
+    ),
67
+    'ESTIMATED_START_DATE' => 
68
+    array (
69 69
     'width' => '10%',
70 70
     'label' => 'LBL_DATE_START',
71 71
     'link' => false,
72 72
     'default' => true,
73
-  ),
74
-  'ASSIGNED_USER_NAME' => 
75
-  array (
73
+    ),
74
+    'ASSIGNED_USER_NAME' => 
75
+    array (
76 76
     'width' => '10%',
77 77
     'label' => 'LBL_LIST_ASSIGNED_USER_ID',
78 78
     'module' => 'Employees',
79 79
     'id' => 'ASSIGNED_USER_ID',
80 80
     'default' => true,
81
-  ),
82
-  'ESTIMATED_END_DATE' => 
83
-  array (
81
+    ),
82
+    'ESTIMATED_END_DATE' => 
83
+    array (
84 84
     'width' => '10%',
85 85
     'label' => 'LBL_DATE_END',
86 86
     'link' => false,
87 87
     'default' => true,
88
-  ),
88
+    ),
89 89
 );
90 90
 ?>
Please login to merge, or discard this patch.
modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.meta.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@
 block discarded – undo
49 49
 global $app_strings;
50 50
 
51 51
 $dashletMeta['SugarFeedDashlet'] = array('module'		=> 'SugarFeed',
52
-										  'title'       => translate('LBL_HOMEPAGE_TITLE', 'SugarFeed'), 
53
-                                          'description' => 'A customizable view into Sugar_Feed',
54
-                                          'icon'        => 'themes/default/images/icon_SugarFeed_32.gif',
55
-                                          'dynamic_hide' => true,
56
-                                          'category'    => 'Tools');
57 52
\ No newline at end of file
53
+                                            'title'       => translate('LBL_HOMEPAGE_TITLE', 'SugarFeed'), 
54
+                                            'description' => 'A customizable view into Sugar_Feed',
55
+                                            'icon'        => 'themes/default/images/icon_SugarFeed_32.gif',
56
+                                            'dynamic_hide' => true,
57
+                                            'category'    => 'Tools');
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
modules/ProjectTask/ProjectTaskQuickCreate.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -75,29 +75,29 @@
 block discarded – undo
75 75
 ///
76 76
 /// SETUP PARENT POPUP
77 77
 
78
-	$popup_request_data = array(
79
-		'call_back_function' => 'set_return',
80
-		'form_name' => 'projectTypeQuickCreate',
81
-		'field_to_name_array' => array(
82
-			'id' => 'parent_id',
83
-			'name' => 'parent_name',
84
-			),
85
-		);
78
+    $popup_request_data = array(
79
+        'call_back_function' => 'set_return',
80
+        'form_name' => 'projectTypeQuickCreate',
81
+        'field_to_name_array' => array(
82
+            'id' => 'parent_id',
83
+            'name' => 'parent_name',
84
+            ),
85
+        );
86 86
 
87
-	$encoded_parent_popup_request_data = $json->encode($popup_request_data);
88
-	$this->ss->assign('encoded_parent_popup_request_data', $encoded_parent_popup_request_data);        
87
+    $encoded_parent_popup_request_data = $json->encode($popup_request_data);
88
+    $this->ss->assign('encoded_parent_popup_request_data', $encoded_parent_popup_request_data);        
89 89
         
90
-		$popup_request_data = array(
91
-			'call_back_function' => 'set_return',
92
-			'form_name' => 'projectTaskQuickCreate',
93
-			'field_to_name_array' => array(
94
-				'id' => 'account_id',
95
-				'name' => 'account_name',
96
-			),
97
-		);
90
+        $popup_request_data = array(
91
+            'call_back_function' => 'set_return',
92
+            'form_name' => 'projectTaskQuickCreate',
93
+            'field_to_name_array' => array(
94
+                'id' => 'account_id',
95
+                'name' => 'account_name',
96
+            ),
97
+        );
98 98
 	
99
-		$encoded_popup_request_data = $json->encode($popup_request_data);
100
-		$this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
99
+        $encoded_popup_request_data = $json->encode($popup_request_data);
100
+        $this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
101 101
 
102 102
         
103 103
     }   
Please login to merge, or discard this patch.
modules/ProjectTask/MyProjectTasks.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -59,19 +59,19 @@
 block discarded – undo
59 59
 $ListView = new ListView();
60 60
 $seedProjectTask = new ProjectTask();
61 61
 $where = "project_task.assigned_user_id='{$current_user->id}'"
62
-	. " AND (project_task.status IS NULL OR (project_task.status!='Completed' AND project_task.status!='Deferred'))"
63
-	. " AND (project_task.date_start IS NULL OR project_task.date_start <= '$today')";
62
+    . " AND (project_task.status IS NULL OR (project_task.status!='Completed' AND project_task.status!='Deferred'))"
63
+    . " AND (project_task.date_start IS NULL OR project_task.date_start <= '$today')";
64 64
 $ListView->initNewXTemplate('modules/ProjectTask/MyProjectTasks.html',
65
-	$current_module_strings);
65
+    $current_module_strings);
66 66
 $header_text = '';
67 67
 
68 68
 if(is_admin($current_user)
69
-	&& $_REQUEST['module'] != 'DynamicLayout'
70
-	&& !empty($_SESSION['editinplace']))
69
+    && $_REQUEST['module'] != 'DynamicLayout'
70
+    && !empty($_SESSION['editinplace']))
71 71
 {	
72
-	$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=MyTasks&from_module=Tasks'>"
73
-		. SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])
74
-		. '</a>';
72
+    $header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=MyTasks&from_module=Tasks'>"
73
+        . SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])
74
+        . '</a>';
75 75
 }
76 76
 $ListView->setHeaderTitle($current_module_strings['LBL_LIST_MY_PROJECT_TASKS'].$header_text);
77 77
 $ListView->setQuery($where, "", "date_due,priority desc", "PROJECT_TASK");
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/additionalDetails.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -42,31 +42,31 @@
 block discarded – undo
42 42
 
43 43
 
44 44
 function additionalDetailsProjectTask($fields) {
45
-	static $mod_strings;
46
-	if(empty($mod_strings)) {
47
-		global $current_language;
48
-		$mod_strings = return_module_language($current_language, 'ProjectTask');
49
-	}
45
+    static $mod_strings;
46
+    if(empty($mod_strings)) {
47
+        global $current_language;
48
+        $mod_strings = return_module_language($current_language, 'ProjectTask');
49
+    }
50 50
 		
51
-	$overlib_string = '';
52
-	if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>' . $mod_strings['LBL_PRIORITY'] . '</b> ' . $fields['PRIORITY'] . '<br>';
53
-	if(!empty($fields['PERCENT_COMPLETE'])) $overlib_string .= '<b>' . $mod_strings['LBL_PERCENT_COMPLETE'] . '</b> ' . $fields['PERCENT_COMPLETE'] . '%<br>';	
54
-	if(!empty($fields['ESTIMATED_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ESTIMATED_EFFORT'] . '</b> ' . $fields['ESTIMATED_EFFORT'] . '<br>';	
55
-	if(!empty($fields['ACTUAL_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ACTUAL_EFFORT'] . '</b> ' . $fields['ACTUAL_EFFORT'] . '<br>';
56
-	if(!empty($fields['TASK_NUMBER'])) $overlib_string .= '<b>' . $mod_strings['LBL_TASK_NUMBER'] . '</b> ' . $fields['TASK_NUMBER'] . '<br>';
57
-	if(!empty($fields['DATE_START'])) $overlib_string .= '<b>' . $mod_strings['LBL_DATE_START'] . '</b> ' . $fields['DATE_START'] . ' ' . $fields['TIME_START'] . '<br>';
51
+    $overlib_string = '';
52
+    if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>' . $mod_strings['LBL_PRIORITY'] . '</b> ' . $fields['PRIORITY'] . '<br>';
53
+    if(!empty($fields['PERCENT_COMPLETE'])) $overlib_string .= '<b>' . $mod_strings['LBL_PERCENT_COMPLETE'] . '</b> ' . $fields['PERCENT_COMPLETE'] . '%<br>';	
54
+    if(!empty($fields['ESTIMATED_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ESTIMATED_EFFORT'] . '</b> ' . $fields['ESTIMATED_EFFORT'] . '<br>';	
55
+    if(!empty($fields['ACTUAL_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ACTUAL_EFFORT'] . '</b> ' . $fields['ACTUAL_EFFORT'] . '<br>';
56
+    if(!empty($fields['TASK_NUMBER'])) $overlib_string .= '<b>' . $mod_strings['LBL_TASK_NUMBER'] . '</b> ' . $fields['TASK_NUMBER'] . '<br>';
57
+    if(!empty($fields['DATE_START'])) $overlib_string .= '<b>' . $mod_strings['LBL_DATE_START'] . '</b> ' . $fields['DATE_START'] . ' ' . $fields['TIME_START'] . '<br>';
58 58
 		
59
-	if(!empty($fields['DESCRIPTION'])) {
60
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
61
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
62
-	}	
59
+    if(!empty($fields['DESCRIPTION'])) {
60
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
61
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
62
+    }	
63 63
 
64
-	return array('fieldToAddTo' => 'NAME', 
65
-				 'string' => $overlib_string, 
66
-				 'editLink' => "index.php?action=EditView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}", 
67
-				 'viewLink' => "index.php?action=DetailView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}");
64
+    return array('fieldToAddTo' => 'NAME', 
65
+                    'string' => $overlib_string, 
66
+                    'editLink' => "index.php?action=EditView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}", 
67
+                    'viewLink' => "index.php?action=DetailView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}");
68 68
 }
69 69
  
70
- ?>
70
+    ?>
71 71
  
72 72
  
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/acldefs.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -40,32 +40,32 @@
 block discarded – undo
40 40
 
41 41
 // created: 2005-11-04 15:39:46
42 42
 $acldefs['ProjectTask'] = array (
43
-  'forms' => 
44
-  array (
43
+    'forms' => 
44
+    array (
45 45
     'by_name' => 
46 46
     array (
47
-      'change_project' => 
48
-      array (
47
+        'change_project' => 
48
+        array (
49 49
         'display_option' => 'disabled',
50 50
         'action_option' => 'list',
51 51
         'app_action' => 'EditView',
52 52
         'module' => 'Project',
53
-      ),
54
-      'change_parent' => 
55
-      array (
53
+        ),
54
+        'change_parent' => 
55
+        array (
56 56
         'display_option' => 'disabled',
57 57
         'action_option' => 'list',
58 58
         'app_action' => 'EditView',
59 59
         'module' => 'ProjectTask',
60
-      ),
60
+        ),
61
+    ),
61 62
     ),
62
-  ),
63
-  'form_names' => 
64
-  array (
63
+    'form_names' => 
64
+    array (
65 65
     'by_id' => 'by_id',
66 66
     'by_name' => 'by_name',
67 67
     'DetailView' => 'DetailView',
68 68
     'EditView' => 'EditView',
69
-  ),
69
+    ),
70 70
 );
71 71
 ?>
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/editviewdefs.php 1 patch
Indentation   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -1,133 +1,133 @@
 block discarded – undo
1 1
 <?php
2 2
 $viewdefs ['ProjectTask'] = 
3 3
 array (
4
-  'EditView' => 
5
-  array (
4
+    'EditView' => 
5
+    array (
6 6
     'templateMeta' => 
7 7
     array (
8
-      'maxColumns' => '2',
9
-      'widths' => 
10
-      array (
8
+        'maxColumns' => '2',
9
+        'widths' => 
10
+        array (
11 11
         0 => 
12 12
         array (
13
-          'label' => '10',
14
-          'field' => '30',
13
+            'label' => '10',
14
+            'field' => '30',
15 15
         ),
16 16
         1 => 
17 17
         array (
18
-          'label' => '10',
19
-          'field' => '30',
18
+            'label' => '10',
19
+            'field' => '30',
20 20
         ),
21
-      ),
22
-      'includes' => 
23
-      array (
21
+        ),
22
+        'includes' => 
23
+        array (
24 24
         0 => 
25 25
         array (
26
-          'file' => 'modules/ProjectTask/ProjectTask.js',
26
+            'file' => 'modules/ProjectTask/ProjectTask.js',
27 27
         ),
28
-      ),
29
-      'useTabs' => false,
30
-      'tabDefs' => 
31
-      array (
28
+        ),
29
+        'useTabs' => false,
30
+        'tabDefs' => 
31
+        array (
32 32
         'DEFAULT' => 
33 33
         array (
34
-          'newTab' => false,
35
-          'panelDefault' => 'expanded',
34
+            'newTab' => false,
35
+            'panelDefault' => 'expanded',
36 36
         ),
37 37
         'LBL_PANEL_TIMELINE' =>
38 38
         array (
39
-          'newTab' => false,
40
-          'panelDefault' => 'expanded',
39
+            'newTab' => false,
40
+            'panelDefault' => 'expanded',
41
+        ),
41 42
         ),
42
-      ),
43
-      'syncDetailEditViews' => false,
43
+        'syncDetailEditViews' => false,
44 44
     ),
45 45
     'panels' => 
46 46
     array (
47
-      'default' => 
48
-      array (
47
+        'default' => 
48
+        array (
49 49
         0 => 
50 50
         array (
51
-          0 => 
52
-          array (
51
+            0 => 
52
+            array (
53 53
             'name' => 'name',
54 54
             'label' => 'LBL_NAME',
55
-          ),
56
-          1 => 
57
-          array (
55
+            ),
56
+            1 => 
57
+            array (
58 58
             'name' => 'status',
59 59
             'customCode' => '<select name="{$fields.status.name}" id="{$fields.status.name}" title="" tabindex="s" onchange="update_percent_complete(this.value);">{if isset($fields.status.value) && $fields.status.value != ""}{html_options options=$fields.status.options selected=$fields.status.value}{else}{html_options options=$fields.status.options selected=$fields.status.default}{/if}</select>',
60
-          ),
60
+            ),
61 61
         ),
62 62
         1 => 
63 63
         array (
64
-          0 => 
65
-          array (
64
+            0 => 
65
+            array (
66 66
             'name' => 'date_start',
67
-          ),
68
-          1 => 
69
-          array (
67
+            ),
68
+            1 => 
69
+            array (
70 70
             'name' => 'date_finish',
71
-          ),
71
+            ),
72 72
         ),
73 73
         2 => 
74 74
         array (
75
-          0 => 'priority',
76
-          1 => 
77
-          array (
75
+            0 => 'priority',
76
+            1 => 
77
+            array (
78 78
             'name' => 'percent_complete',
79 79
             'customCode' => '<input type="text" name="{$fields.percent_complete.name}" id="{$fields.percent_complete.name}" size="30" value="{$fields.percent_complete.value}" title="" tabindex="0" onChange="update_status(this.value);" /></tr>',
80
-          ),
80
+            ),
81 81
         ),
82 82
         3 => 
83 83
         array (
84
-          0 => 
85
-          array (
84
+            0 => 
85
+            array (
86 86
             'name' => 'project_name',
87 87
             'label' => 'LBL_PROJECT_NAME',
88
-          ),
89
-          1 => 'task_number',
88
+            ),
89
+            1 => 'task_number',
90 90
         ),
91 91
         4 => 
92 92
         array (
93
-          0 => 'assigned_user_name',
93
+            0 => 'assigned_user_name',
94 94
         ),
95 95
         5 => 
96 96
         array (
97
-          0 => 
98
-          array (
97
+            0 => 
98
+            array (
99 99
             'name' => 'description',
100
-          ),
100
+            ),
101
+        ),
101 102
         ),
102
-      ),
103
-      'LBL_PANEL_TIMELINE' =>
104
-      array (
103
+        'LBL_PANEL_TIMELINE' =>
104
+        array (
105 105
         0 => 
106 106
         array (
107
-          0 => 'estimated_effort',
108
-          1 => 
109
-          array (
107
+            0 => 'estimated_effort',
108
+            1 => 
109
+            array (
110 110
             'name' => 'actual_effort',
111 111
             'label' => 'LBL_ACTUAL_EFFORT',
112
-          ),
112
+            ),
113 113
         ),
114 114
         1 => 
115 115
         array (
116
-          0 => 
117
-          array (
116
+            0 => 
117
+            array (
118 118
             'name' => 'relationship_type',
119 119
             'studio' => 'visible',
120 120
             'label' => 'LBL_RELATIONSHIP_TYPE',
121
-          ),
122
-          1 => 'utilization',
121
+            ),
122
+            1 => 'utilization',
123 123
         ),
124 124
         2 => 
125 125
         array (
126
-          0 => 'order_number',
127
-          1 => 'milestone_flag',
126
+            0 => 'order_number',
127
+            1 => 'milestone_flag',
128
+        ),
128 129
         ),
129
-      ),
130 130
     ),
131
-  ),
131
+    ),
132 132
 );
133 133
 ?>
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/popupdefs.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -40,13 +40,13 @@
 block discarded – undo
40 40
 
41 41
 
42 42
 $popupMeta = array('moduleMain' => 'ProjectTask',
43
-						'varName' => 'PROJECT_TASK',
44
-						'orderBy' => 'name',
45
-						'whereClauses' => 
46
-							array('name' => 'project_task.name'),
47
-						'searchInputs' =>
48
-							array('name')
49
-						);
43
+                        'varName' => 'PROJECT_TASK',
44
+                        'orderBy' => 'name',
45
+                        'whereClauses' => 
46
+                            array('name' => 'project_task.name'),
47
+                        'searchInputs' =>
48
+                            array('name')
49
+                        );
50 50
 
51 51
 
52 52
 ?>
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/searchdefs.php 1 patch
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -38,24 +38,24 @@
 block discarded – undo
38 38
  ********************************************************************************/
39 39
 
40 40
 
41
-  $searchdefs['ProjectTask'] = array(
42
-					'templateMeta' => array(
43
-							'maxColumns' => '3', 
41
+    $searchdefs['ProjectTask'] = array(
42
+                    'templateMeta' => array(
43
+                            'maxColumns' => '3', 
44 44
                             'maxColumnsBasic' => '4', 
45 45
                             'widths' => array('label' => '10', 'field' => '30'),                 
46
-                           ),
46
+                            ),
47 47
                     'layout' => array(  					
48
-						'basic_search' => array(
49
-						 	'name',
50
-						 	array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
48
+                        'basic_search' => array(
49
+                                'name',
50
+                                array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
51 51
 						 	
52
-						),
53
-						'advanced_search' => array(
54
-							'name',
55
-							array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME' ), 
56
-							array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
52
+                        ),
53
+                        'advanced_search' => array(
54
+                            'name',
55
+                            array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME' ), 
56
+                            array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
57 57
 							
58
-						),
59
-					),
60
- 			   );
58
+                        ),
59
+                    ),
60
+                );
61 61
 ?>
Please login to merge, or discard this patch.