Completed
Push — develop ( edae1e...431cf5 )
by Adam
20:48
created
modules/Project/metadata/searchdefs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 						'basic_search' => array(
49 49
 						 	'name',
50 50
 						 	array('name'=>'current_user_only', 'label'=>'LBL_CURRENT_USER_FILTER', 'type'=>'bool'),
51
-                            array ('name' => 'favorites_only','label' => 'LBL_FAVORITES_FILTER','type' => 'bool',),
51
+                            array('name' => 'favorites_only', 'label' => 'LBL_FAVORITES_FILTER', 'type' => 'bool',),
52 52
 
53 53
 
54 54
                         ),
Please login to merge, or discard this patch.
modules/Project/metadata/listviewdefs.php 1 patch
Spacing   +8 added lines, -8 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,37 +42,37 @@  discard block
 block discarded – undo
42 42
 
43 43
 
44 44
 $listViewDefs ['Project'] =
45
-array (
45
+array(
46 46
   'NAME' => 
47
-  array (
47
+  array(
48 48
     'width' => '25%',
49 49
     'label' => 'LBL_LIST_NAME',
50 50
     'link' => true,
51 51
     'default' => true,
52 52
   ),
53 53
   'PRIORITY' => 
54
-  array (
54
+  array(
55 55
     'type' => 'enum',
56 56
     'label' => 'LBL_PRIORITY',
57 57
     'width' => '10%',
58 58
     'default' => true,
59 59
   ),
60 60
   'STATUS' => 
61
-  array (
61
+  array(
62 62
     'width' => '10%',
63 63
     'label' => 'LBL_STATUS',
64 64
     'link' => false,
65 65
     'default' => true,
66 66
   ),
67 67
   'ESTIMATED_START_DATE' => 
68
-  array (
68
+  array(
69 69
     'width' => '10%',
70 70
     'label' => 'LBL_DATE_START',
71 71
     'link' => false,
72 72
     'default' => true,
73 73
   ),
74 74
   'ASSIGNED_USER_NAME' => 
75
-  array (
75
+  array(
76 76
     'width' => '10%',
77 77
     'label' => 'LBL_LIST_ASSIGNED_USER_ID',
78 78
     'module' => 'Employees',
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
     'default' => true,
81 81
   ),
82 82
   'ESTIMATED_END_DATE' => 
83
-  array (
83
+  array(
84 84
     'width' => '10%',
85 85
     'label' => 'LBL_DATE_END',
86 86
     'link' => false,
Please login to merge, or discard this patch.
modules/ProjectTask/ProjectTaskQuickCreate.php 1 patch
Spacing   +2 added lines, -2 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.
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
         
54 54
         parent::process();
55 55
         
56
-        if($this->viaAJAX) { // override for ajax call
56
+        if ($this->viaAJAX) { // override for ajax call
57 57
             $this->ss->assign('saveOnclick', "onclick='if(check_form(\"projectTaskQuickCreate\")) return SUGAR.subpanelUtils.inlineSave(this.form.id, \"projecttask\"); else return false;'");
58 58
             $this->ss->assign('cancelOnclick', "onclick='return SUGAR.subpanelUtils.cancelCreate(\"subpanel_projecttask\")';");
59 59
         }
Please login to merge, or discard this patch.
modules/ProjectTask/MyProjectTasks.php 1 patch
Spacing   +3 added lines, -3 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.
@@ -65,12 +65,12 @@  discard block
 block discarded – undo
65 65
 	$current_module_strings);
66 66
 $header_text = '';
67 67
 
68
-if(is_admin($current_user)
68
+if (is_admin($current_user)
69 69
 	&& $_REQUEST['module'] != 'DynamicLayout'
70 70
 	&& !empty($_SESSION['editinplace']))
71 71
 {	
72 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'])
73
+		. SugarThemeRegistry::current()->getImage("EditLayout", "border='0' align='bottom'", null, null, '.gif', $mod_strings['LBL_EDITLAYOUT'])
74 74
 		. '</a>';
75 75
 }
76 76
 $ListView->setHeaderTitle($current_module_strings['LBL_LIST_MY_PROJECT_TASKS'].$header_text);
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/additionalDetails.php 1 patch
Spacing   +11 added lines, -11 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.
@@ -43,22 +43,22 @@  discard block
 block discarded – undo
43 43
 
44 44
 function additionalDetailsProjectTask($fields) {
45 45
 	static $mod_strings;
46
-	if(empty($mod_strings)) {
46
+	if (empty($mod_strings)) {
47 47
 		global $current_language;
48 48
 		$mod_strings = return_module_language($current_language, 'ProjectTask');
49 49
 	}
50 50
 		
51 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>';
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 .= '...';
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 62
 	}	
63 63
 
64 64
 	return array('fieldToAddTo' => 'NAME', 
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/subpaneldefs.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
             'sort_by' => 'date_start',
50 50
             'title_key' => 'LBL_ACTIVITIES_SUBPANEL_TITLE',
51 51
             'type' => 'collection',
52
-            'subpanel_name' => 'activities',   //this values is not associated with a physical file.
52
+            'subpanel_name' => 'activities', //this values is not associated with a physical file.
53 53
             'module' => 'Activities',
54 54
 
55 55
             'top_buttons' => array(
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
             'sort_by' => 'date_entered',
85 85
             'title_key' => 'LBL_HISTORY_SUBPANEL_TITLE',
86 86
             'type' => 'collection',
87
-            'subpanel_name' => 'history',   //this values is not associated with a physical file.
87
+            'subpanel_name' => 'history', //this values is not associated with a physical file.
88 88
             'module' => 'Activities',
89 89
 
90 90
             'top_buttons' => array(
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/acldefs.php 1 patch
Spacing   +7 added lines, -7 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.
@@ -39,20 +39,20 @@  discard block
 block discarded – undo
39 39
  ********************************************************************************/
40 40
 
41 41
 // created: 2005-11-04 15:39:46
42
-$acldefs['ProjectTask'] = array (
42
+$acldefs['ProjectTask'] = array(
43 43
   'forms' => 
44
-  array (
44
+  array(
45 45
     'by_name' => 
46
-    array (
46
+    array(
47 47
       'change_project' => 
48
-      array (
48
+      array(
49 49
         'display_option' => 'disabled',
50 50
         'action_option' => 'list',
51 51
         'app_action' => 'EditView',
52 52
         'module' => 'Project',
53 53
       ),
54 54
       'change_parent' => 
55
-      array (
55
+      array(
56 56
         'display_option' => 'disabled',
57 57
         'action_option' => 'list',
58 58
         'app_action' => 'EditView',
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
     ),
62 62
   ),
63 63
   'form_names' => 
64
-  array (
64
+  array(
65 65
     'by_id' => 'by_id',
66 66
     'by_name' => 'by_name',
67 67
     'DetailView' => 'DetailView',
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/editviewdefs.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -1,41 +1,41 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 $viewdefs ['ProjectTask'] = 
3
-array (
3
+array(
4 4
   'EditView' => 
5
-  array (
5
+  array(
6 6
     'templateMeta' => 
7
-    array (
7
+    array(
8 8
       'maxColumns' => '2',
9 9
       'widths' => 
10
-      array (
10
+      array(
11 11
         0 => 
12
-        array (
12
+        array(
13 13
           'label' => '10',
14 14
           'field' => '30',
15 15
         ),
16 16
         1 => 
17
-        array (
17
+        array(
18 18
           'label' => '10',
19 19
           'field' => '30',
20 20
         ),
21 21
       ),
22 22
       'includes' => 
23
-      array (
23
+      array(
24 24
         0 => 
25
-        array (
25
+        array(
26 26
           'file' => 'modules/ProjectTask/ProjectTask.js',
27 27
         ),
28 28
       ),
29 29
       'useTabs' => false,
30 30
       'tabDefs' => 
31
-      array (
31
+      array(
32 32
         'DEFAULT' => 
33
-        array (
33
+        array(
34 34
           'newTab' => false,
35 35
           'panelDefault' => 'expanded',
36 36
         ),
37 37
         'LBL_PANEL_TIMELINE' =>
38
-        array (
38
+        array(
39 39
           'newTab' => false,
40 40
           'panelDefault' => 'expanded',
41 41
         ),
@@ -43,78 +43,78 @@  discard block
 block discarded – undo
43 43
       'syncDetailEditViews' => false,
44 44
     ),
45 45
     'panels' => 
46
-    array (
46
+    array(
47 47
       'default' => 
48
-      array (
48
+      array(
49 49
         0 => 
50
-        array (
50
+        array(
51 51
           0 => 
52
-          array (
52
+          array(
53 53
             'name' => 'name',
54 54
             'label' => 'LBL_NAME',
55 55
           ),
56 56
           1 => 
57
-          array (
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
-        array (
63
+        array(
64 64
           0 => 
65
-          array (
65
+          array(
66 66
             'name' => 'date_start',
67 67
           ),
68 68
           1 => 
69
-          array (
69
+          array(
70 70
             'name' => 'date_finish',
71 71
           ),
72 72
         ),
73 73
         2 => 
74
-        array (
74
+        array(
75 75
           0 => 'priority',
76 76
           1 => 
77
-          array (
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
-        array (
83
+        array(
84 84
           0 => 
85
-          array (
85
+          array(
86 86
             'name' => 'project_name',
87 87
             'label' => 'LBL_PROJECT_NAME',
88 88
           ),
89 89
           1 => 'task_number',
90 90
         ),
91 91
         4 => 
92
-        array (
92
+        array(
93 93
           0 => 'assigned_user_name',
94 94
         ),
95 95
         5 => 
96
-        array (
96
+        array(
97 97
           0 => 
98
-          array (
98
+          array(
99 99
             'name' => 'description',
100 100
           ),
101 101
         ),
102 102
       ),
103 103
       'LBL_PANEL_TIMELINE' =>
104
-      array (
104
+      array(
105 105
         0 => 
106
-        array (
106
+        array(
107 107
           0 => 'estimated_effort',
108 108
           1 => 
109
-          array (
109
+          array(
110 110
             'name' => 'actual_effort',
111 111
             'label' => 'LBL_ACTUAL_EFFORT',
112 112
           ),
113 113
         ),
114 114
         1 => 
115
-        array (
115
+        array(
116 116
           0 => 
117
-          array (
117
+          array(
118 118
             'name' => 'relationship_type',
119 119
             'studio' => 'visible',
120 120
             'label' => 'LBL_RELATIONSHIP_TYPE',
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
           1 => 'utilization',
123 123
         ),
124 124
         2 => 
125
-        array (
125
+        array(
126 126
           0 => 'order_number',
127 127
           1 => 'milestone_flag',
128 128
         ),
Please login to merge, or discard this patch.
modules/ProjectTask/metadata/searchdefs.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -52,7 +52,7 @@
 block discarded – undo
52 52
 						),
53 53
 						'advanced_search' => array(
54 54
 							'name',
55
-							array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME' ), 
55
+							array('name' => 'project_name', 'label'=>'LBL_PROJECT_NAME'), 
56 56
 							array('name' => 'assigned_user_id', 'type' => 'enum', 'label' => 'LBL_ASSIGNED_TO', 'function' => array('name' => 'get_user_array', 'params' => array(false))),
57 57
 							
58 58
 						),
Please login to merge, or discard this patch.