@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | /* Start standard EditView setup logic */ |
56 | 56 | |
57 | 57 | if(isset($_REQUEST['record'])) { |
58 | - $GLOBALS['log']->debug("In EditGroupFolder view, about to retrieve record: ".$_REQUEST['record']); |
|
59 | - $result = $focus->retrieve($_REQUEST['record']); |
|
58 | + $GLOBALS['log']->debug("In EditGroupFolder view, about to retrieve record: ".$_REQUEST['record']); |
|
59 | + $result = $focus->retrieve($_REQUEST['record']); |
|
60 | 60 | if($result == null) |
61 | 61 | { |
62 | - sugar_die($app_strings['ERROR_NO_RECORD']); |
|
62 | + sugar_die($app_strings['ERROR_NO_RECORD']); |
|
63 | 63 | } |
64 | 64 | } |
65 | 65 | |
@@ -85,28 +85,28 @@ discard block |
||
85 | 85 | $groupFolders = Array(); |
86 | 86 | $groupFoldersOrig = array(); |
87 | 87 | foreach($ret['groupFolders'] as $key => $value) { |
88 | - if(!empty($focus->id)) { |
|
89 | - if ($value['id'] == $focus->id) { |
|
90 | - continue; |
|
91 | - } |
|
92 | - } // if |
|
93 | - $groupFolders[$value['id']] = $value['name']; |
|
94 | - $groupFoldersOrig[] = $value['origName']; |
|
88 | + if(!empty($focus->id)) { |
|
89 | + if ($value['id'] == $focus->id) { |
|
90 | + continue; |
|
91 | + } |
|
92 | + } // if |
|
93 | + $groupFolders[$value['id']] = $value['name']; |
|
94 | + $groupFoldersOrig[] = $value['origName']; |
|
95 | 95 | } // foreach |
96 | 96 | $groupFolderName = ""; |
97 | 97 | $addToGroupFolder = ""; |
98 | 98 | $createGroupFolderStyle = "display:''"; |
99 | 99 | $editGroupFolderStyle = "display:''"; |
100 | 100 | if(!empty($focus->id)) { |
101 | - $groupFolderName = $focus->name; |
|
101 | + $groupFolderName = $focus->name; |
|
102 | 102 | } |
103 | 103 | if(!empty($focus->id)) { |
104 | - $addToGroupFolder = $focus->parent_folder; |
|
104 | + $addToGroupFolder = $focus->parent_folder; |
|
105 | 105 | } |
106 | 106 | if(!empty($focus->id)) { |
107 | - $createGroupFolderStyle = "display:none;"; |
|
107 | + $createGroupFolderStyle = "display:none;"; |
|
108 | 108 | } else { |
109 | - $editGroupFolderStyle = "display:none;"; |
|
109 | + $editGroupFolderStyle = "display:none;"; |
|
110 | 110 | } // else |
111 | 111 | $smarty->assign('createGroupFolderStyle', $createGroupFolderStyle); |
112 | 112 | $smarty->assign('editGroupFolderStyle', $editGroupFolderStyle); |
@@ -53,9 +53,9 @@ |
||
53 | 53 | $_REQUEST['parent_folder'] = $_REQUEST['groupFoldersAdd']; |
54 | 54 | $_REQUEST['group_id'] = $_REQUEST['groupFoldersUser']; |
55 | 55 | if (empty($_REQUEST['record'])) { |
56 | - $folder->setFolder($_REQUEST); |
|
56 | + $folder->setFolder($_REQUEST); |
|
57 | 57 | } else { |
58 | - $folder->updateFolder($_REQUEST); |
|
58 | + $folder->updateFolder($_REQUEST); |
|
59 | 59 | } |
60 | 60 | $body1 = " |
61 | 61 | <script type='text/javascript'> |
@@ -40,22 +40,22 @@ discard block |
||
40 | 40 | |
41 | 41 | |
42 | 42 | function additionalDetailsTask($fields) { |
43 | - static $mod_strings; |
|
44 | - global $app_list_strings; |
|
45 | - if(empty($mod_strings)) { |
|
46 | - global $current_language; |
|
47 | - $mod_strings = return_module_language($current_language, 'Tasks'); |
|
48 | - } |
|
43 | + static $mod_strings; |
|
44 | + global $app_list_strings; |
|
45 | + if(empty($mod_strings)) { |
|
46 | + global $current_language; |
|
47 | + $mod_strings = return_module_language($current_language, 'Tasks'); |
|
48 | + } |
|
49 | 49 | |
50 | - $overlib_string = ''; |
|
50 | + $overlib_string = ''; |
|
51 | 51 | if(!empty($fields['NAME'])) { |
52 | - $overlib_string .= '<b>'. $mod_strings['LBL_SUBJECT'] . '</b> ' . $fields['NAME']; |
|
53 | - $overlib_string .= '<br>'; |
|
54 | - } |
|
52 | + $overlib_string .= '<b>'. $mod_strings['LBL_SUBJECT'] . '</b> ' . $fields['NAME']; |
|
53 | + $overlib_string .= '<br>'; |
|
54 | + } |
|
55 | 55 | |
56 | 56 | if(!empty($fields['DATE_START'])) $overlib_string .= '<b>'. $mod_strings['LBL_START_DATE_AND_TIME'] . '</b> ' . $fields['DATE_START'] . '<br>'; |
57 | - if(!empty($fields['DATE_DUE'])) $overlib_string .= '<b>'. $mod_strings['LBL_DUE_DATE_AND_TIME'] . '</b> ' . $fields['DATE_DUE'] . '<br>'; |
|
58 | - if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>'. $mod_strings['LBL_PRIORITY'] . '</b> ' . |
|
57 | + if(!empty($fields['DATE_DUE'])) $overlib_string .= '<b>'. $mod_strings['LBL_DUE_DATE_AND_TIME'] . '</b> ' . $fields['DATE_DUE'] . '<br>'; |
|
58 | + if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>'. $mod_strings['LBL_PRIORITY'] . '</b> ' . |
|
59 | 59 | $app_list_strings['task_priority_dom'][$fields['PRIORITY']] . '<br>'; |
60 | 60 | if (!empty($fields['PARENT_ID'])) |
61 | 61 | { |
@@ -66,18 +66,18 @@ discard block |
||
66 | 66 | } |
67 | 67 | if(!empty($fields['STATUS'])) $overlib_string .= '<b>'. $mod_strings['LBL_STATUS'] . '</b> ' . $app_list_strings['task_status_dom'][$fields['STATUS']] . '<br>'; |
68 | 68 | |
69 | - if(!empty($fields['DESCRIPTION'])) { |
|
70 | - $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300); |
|
71 | - if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...'; |
|
72 | - } |
|
69 | + if(!empty($fields['DESCRIPTION'])) { |
|
70 | + $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300); |
|
71 | + if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...'; |
|
72 | + } |
|
73 | 73 | |
74 | - $editLink = "index.php?action=EditView&module=Tasks&record={$fields['ID']}"; |
|
75 | - $viewLink = "index.php?action=DetailView&module=Tasks&record={$fields['ID']}"; |
|
74 | + $editLink = "index.php?action=EditView&module=Tasks&record={$fields['ID']}"; |
|
75 | + $viewLink = "index.php?action=DetailView&module=Tasks&record={$fields['ID']}"; |
|
76 | 76 | |
77 | - return array('fieldToAddTo' => 'NAME', |
|
78 | - 'string' => $overlib_string, |
|
79 | - 'editLink' => $editLink, |
|
80 | - 'viewLink' => $viewLink); |
|
77 | + return array('fieldToAddTo' => 'NAME', |
|
78 | + 'string' => $overlib_string, |
|
79 | + 'editLink' => $editLink, |
|
80 | + 'viewLink' => $viewLink); |
|
81 | 81 | |
82 | 82 | } |
83 | 83 |
@@ -39,129 +39,129 @@ |
||
39 | 39 | |
40 | 40 | $viewdefs ['Tasks'] = |
41 | 41 | array ( |
42 | - 'EditView' => |
|
43 | - array ( |
|
42 | + 'EditView' => |
|
43 | + array ( |
|
44 | 44 | 'templateMeta' => |
45 | 45 | array ( |
46 | - 'form' => |
|
47 | - array ( |
|
46 | + 'form' => |
|
47 | + array ( |
|
48 | 48 | 'hidden' => |
49 | 49 | array ( |
50 | - '<input type="hidden" name="isSaveAndNew" value="false">', |
|
50 | + '<input type="hidden" name="isSaveAndNew" value="false">', |
|
51 | 51 | ), |
52 | 52 | 'buttons' => |
53 | 53 | array ( |
54 | - 'SAVE', |
|
55 | - 'CANCEL', |
|
54 | + 'SAVE', |
|
55 | + 'CANCEL', |
|
56 | 56 | |
57 | - array ( |
|
57 | + array ( |
|
58 | 58 | 'customCode' => '{if $fields.status.value != "Completed"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" class="button" onclick="document.getElementById(\'status\').value=\'Completed\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Tasks\'; this.form.isDuplicate.value=true; this.form.isSaveAndNew.value=true; this.form.return_action.value=\'EditView\'; this.form.return_id.value=\'{$fields.id.value}\'; if(check_form(\'EditView\'))SUGAR.ajaxUI.submitForm(this.form);" type="button" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_LABEL}">{/if}', |
59 | - ), |
|
59 | + ), |
|
60 | 60 | ), |
61 | - ), |
|
62 | - 'maxColumns' => '2', |
|
63 | - 'widths' => |
|
64 | - array ( |
|
61 | + ), |
|
62 | + 'maxColumns' => '2', |
|
63 | + 'widths' => |
|
64 | + array ( |
|
65 | 65 | |
66 | 66 | array ( |
67 | - 'label' => '10', |
|
68 | - 'field' => '30', |
|
67 | + 'label' => '10', |
|
68 | + 'field' => '30', |
|
69 | 69 | ), |
70 | 70 | |
71 | 71 | array ( |
72 | - 'label' => '10', |
|
73 | - 'field' => '30', |
|
72 | + 'label' => '10', |
|
73 | + 'field' => '30', |
|
74 | + ), |
|
74 | 75 | ), |
75 | - ), |
|
76 | - 'useTabs' => false, |
|
76 | + 'useTabs' => false, |
|
77 | 77 | ), |
78 | 78 | 'panels' => |
79 | 79 | array ( |
80 | - 'lbl_task_information' => |
|
81 | - array ( |
|
80 | + 'lbl_task_information' => |
|
81 | + array ( |
|
82 | 82 | |
83 | 83 | array ( |
84 | 84 | |
85 | - array ( |
|
85 | + array ( |
|
86 | 86 | 'name' => 'name', |
87 | 87 | 'displayParams' => |
88 | 88 | array ( |
89 | - 'required' => true, |
|
89 | + 'required' => true, |
|
90 | + ), |
|
90 | 91 | ), |
91 | - ), |
|
92 | 92 | |
93 | - array ( |
|
93 | + array ( |
|
94 | 94 | 'name' => 'status', |
95 | 95 | 'displayParams' => |
96 | 96 | array ( |
97 | - 'required' => true, |
|
97 | + 'required' => true, |
|
98 | + ), |
|
98 | 99 | ), |
99 | - ), |
|
100 | 100 | ), |
101 | 101 | |
102 | 102 | array ( |
103 | 103 | |
104 | - array ( |
|
104 | + array ( |
|
105 | 105 | 'name' => 'date_start', |
106 | 106 | 'type' => 'datetimecombo', |
107 | 107 | 'displayParams' => |
108 | 108 | array ( |
109 | - 'showNoneCheckbox' => true, |
|
110 | - 'showFormats' => true, |
|
109 | + 'showNoneCheckbox' => true, |
|
110 | + 'showFormats' => true, |
|
111 | + ), |
|
111 | 112 | ), |
112 | - ), |
|
113 | 113 | |
114 | - array ( |
|
114 | + array ( |
|
115 | 115 | 'name' => 'parent_name', |
116 | 116 | 'label' => 'LBL_LIST_RELATED_TO', |
117 | - ), |
|
117 | + ), |
|
118 | 118 | ), |
119 | 119 | |
120 | 120 | array ( |
121 | 121 | |
122 | - array ( |
|
122 | + array ( |
|
123 | 123 | 'name' => 'date_due', |
124 | 124 | 'type' => 'datetimecombo', |
125 | 125 | 'displayParams' => |
126 | 126 | array ( |
127 | - 'showNoneCheckbox' => true, |
|
128 | - 'showFormats' => true, |
|
127 | + 'showNoneCheckbox' => true, |
|
128 | + 'showFormats' => true, |
|
129 | + ), |
|
129 | 130 | ), |
130 | - ), |
|
131 | 131 | |
132 | - array ( |
|
132 | + array ( |
|
133 | 133 | 'name' => 'contact_name', |
134 | 134 | 'label' => 'LBL_CONTACT_NAME', |
135 | - ), |
|
135 | + ), |
|
136 | 136 | ), |
137 | 137 | |
138 | 138 | array ( |
139 | 139 | |
140 | - array ( |
|
140 | + array ( |
|
141 | 141 | 'name' => 'priority', |
142 | 142 | 'displayParams' => |
143 | 143 | array ( |
144 | - 'required' => true, |
|
144 | + 'required' => true, |
|
145 | + ), |
|
145 | 146 | ), |
146 | - ), |
|
147 | 147 | |
148 | 148 | ), |
149 | 149 | |
150 | 150 | array ( |
151 | 151 | |
152 | - array ( |
|
152 | + array ( |
|
153 | 153 | 'name' => 'description', |
154 | - ), |
|
154 | + ), |
|
155 | + ), |
|
155 | 156 | ), |
156 | - ), |
|
157 | 157 | |
158 | - 'LBL_PANEL_ASSIGNMENT' => array( |
|
159 | - array( |
|
160 | - 'assigned_user_name', |
|
161 | - ), |
|
162 | - ), |
|
158 | + 'LBL_PANEL_ASSIGNMENT' => array( |
|
159 | + array( |
|
160 | + 'assigned_user_name', |
|
161 | + ), |
|
162 | + ), |
|
163 | 163 | |
164 | 164 | ), |
165 | - ), |
|
165 | + ), |
|
166 | 166 | ); |
167 | 167 | ?> |
@@ -40,20 +40,20 @@ discard block |
||
40 | 40 | global $current_user; |
41 | 41 | $module_name = "Tasks"; |
42 | 42 | $searchFields['Tasks'] = |
43 | - array ( |
|
44 | - 'name' => array( 'query_type'=>'default'), |
|
43 | + array ( |
|
44 | + 'name' => array( 'query_type'=>'default'), |
|
45 | 45 | 'contact_name' => array('query_type' => 'default', 'db_field' => array('contacts.first_name', 'contacts.last_name'), 'force_unifiedsearch' => true), |
46 | 46 | 'current_user_only'=> array('query_type'=>'default','db_field'=>array('assigned_user_id'),'my_items'=>true, 'vname' => 'LBL_CURRENT_USER_FILTER', 'type' => 'bool'), |
47 | 47 | 'assigned_user_id'=> array('query_type'=>'default'), |
48 | 48 | 'status'=> array('query_type'=>'default', 'options' => 'task_status_dom', 'template_var' => 'STATUS_FILTER'), |
49 | 49 | |
50 | - 'open_only' => array( |
|
51 | - 'query_type'=>'default', |
|
52 | - 'db_field'=>array('status'), |
|
53 | - 'operator'=>'not in', |
|
54 | - 'closed_values' => array('Completed', 'Deferred'), |
|
55 | - 'type'=>'bool', |
|
56 | - ), |
|
50 | + 'open_only' => array( |
|
51 | + 'query_type'=>'default', |
|
52 | + 'db_field'=>array('status'), |
|
53 | + 'operator'=>'not in', |
|
54 | + 'closed_values' => array('Completed', 'Deferred'), |
|
55 | + 'type'=>'bool', |
|
56 | + ), |
|
57 | 57 | 'favorites_only' => array( |
58 | 58 | 'query_type'=>'format', |
59 | 59 | 'operator' => 'subquery', |
@@ -62,20 +62,20 @@ discard block |
||
62 | 62 | and favorites.parent_type = "'.$module_name.'" |
63 | 63 | and favorites.assigned_user_id = "' .$current_user->id . '") OR NOT ({0}', |
64 | 64 | 'db_field'=>array('id')), |
65 | - //Range Search Support |
|
66 | - 'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
67 | - 'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
68 | - 'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
69 | - 'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
70 | - 'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
71 | - 'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
65 | + //Range Search Support |
|
66 | + 'range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
67 | + 'start_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
68 | + 'end_range_date_entered' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
69 | + 'range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
70 | + 'start_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
71 | + 'end_range_date_modified' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
72 | 72 | |
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_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
77 | - 'start_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
78 | - 'end_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
79 | - //Range Search Support |
|
80 | - ); |
|
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_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
77 | + 'start_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
78 | + 'end_range_date_due' => array ('query_type' => 'default', 'enable_range_search' => true, 'is_date_field' => true), |
|
79 | + //Range Search Support |
|
80 | + ); |
|
81 | 81 | ?> |
@@ -39,157 +39,157 @@ |
||
39 | 39 | |
40 | 40 | $viewdefs ['Tasks'] = |
41 | 41 | array ( |
42 | - 'DetailView' => |
|
43 | - array ( |
|
42 | + 'DetailView' => |
|
43 | + array ( |
|
44 | 44 | 'templateMeta' => |
45 | 45 | array ( |
46 | - 'form' => |
|
47 | - array ( |
|
46 | + 'form' => |
|
47 | + array ( |
|
48 | 48 | 'buttons' => |
49 | 49 | array ( |
50 | - 0 => 'EDIT', |
|
51 | - 1 => 'DUPLICATE', |
|
52 | - 2 => 'DELETE', |
|
53 | - 3 => |
|
54 | - array ( |
|
50 | + 0 => 'EDIT', |
|
51 | + 1 => 'DUPLICATE', |
|
52 | + 2 => 'DELETE', |
|
53 | + 3 => |
|
54 | + array ( |
|
55 | 55 | 'customCode' => '{if $fields.status.value != "Completed"} <input type="hidden" name="isSaveAndNew" value="false"> <input type="hidden" name="status" value=""> <input id="close_and_create_new_button" title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" class="button" onclick="this.form.action.value=\'Save\'; this.form.return_module.value=\'Tasks\'; 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}\';" name="button" value="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" type="submit">{/if}', |
56 | 56 | 'sugar_html' => |
57 | 57 | array ( |
58 | - 'type' => 'submit', |
|
59 | - 'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}', |
|
60 | - 'htmlOptions' => |
|
61 | - array ( |
|
58 | + 'type' => 'submit', |
|
59 | + 'value' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}', |
|
60 | + 'htmlOptions' => |
|
61 | + array ( |
|
62 | 62 | 'title' => '{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}', |
63 | 63 | 'class' => 'button', |
64 | 64 | 'onclick' => 'this.form.action.value=\'Save\'; this.form.return_module.value=\'Tasks\'; 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}\';', |
65 | 65 | 'name' => 'button', |
66 | 66 | 'id' => 'close_and_create_new_button', |
67 | - ), |
|
68 | - 'template' => '{if $fields.status.value != "Completed"}[CONTENT]{/if}', |
|
67 | + ), |
|
68 | + 'template' => '{if $fields.status.value != "Completed"}[CONTENT]{/if}', |
|
69 | + ), |
|
69 | 70 | ), |
70 | - ), |
|
71 | - 4 => |
|
72 | - array ( |
|
71 | + 4 => |
|
72 | + array ( |
|
73 | 73 | 'customCode' => '{if $fields.status.value != "Completed"} <input type="hidden" name="isSave" value="false"> <input title="{$APP.LBL_CLOSE_BUTTON_TITLE}" id="close_button" class="button" onclick="this.form.status.value=\'Completed\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Tasks\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'" name="button1" value="{$APP.LBL_CLOSE_BUTTON_TITLE}" type="submit">{/if}', |
74 | 74 | 'sugar_html' => |
75 | 75 | array ( |
76 | - 'type' => 'submit', |
|
77 | - 'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}', |
|
78 | - 'htmlOptions' => |
|
79 | - array ( |
|
76 | + 'type' => 'submit', |
|
77 | + 'value' => '{$APP.LBL_CLOSE_BUTTON_TITLE}', |
|
78 | + 'htmlOptions' => |
|
79 | + array ( |
|
80 | 80 | 'title' => '{$APP.LBL_CLOSE_BUTTON_TITLE}', |
81 | 81 | 'class' => 'button', |
82 | 82 | 'onclick' => 'this.form.status.value=\'Completed\'; this.form.action.value=\'Save\';this.form.return_module.value=\'Tasks\';this.form.isSave.value=true;this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$fields.id.value}\'', |
83 | 83 | 'name' => 'button1', |
84 | 84 | 'id' => 'close_button', |
85 | - ), |
|
85 | + ), |
|
86 | 86 | 'template' => '{if $fields.status.value != "Completed"}[CONTENT]{/if}' |
87 | 87 | ), |
88 | - ), |
|
88 | + ), |
|
89 | 89 | ), |
90 | 90 | 'hidden' => |
91 | 91 | array ( |
92 | - 0 => '<input type="hidden" name="isSaveAndNew">', |
|
93 | - 1 => '<input type="hidden" name="status" value="">', |
|
94 | - 2 => '<input type="hidden" name="isSave">', |
|
92 | + 0 => '<input type="hidden" name="isSaveAndNew">', |
|
93 | + 1 => '<input type="hidden" name="status" value="">', |
|
94 | + 2 => '<input type="hidden" name="isSave">', |
|
95 | 95 | ), |
96 | - ), |
|
97 | - 'maxColumns' => '2', |
|
98 | - 'widths' => |
|
99 | - array ( |
|
96 | + ), |
|
97 | + 'maxColumns' => '2', |
|
98 | + 'widths' => |
|
99 | + array ( |
|
100 | 100 | 0 => |
101 | 101 | array ( |
102 | - 'label' => '10', |
|
103 | - 'field' => '30', |
|
102 | + 'label' => '10', |
|
103 | + 'field' => '30', |
|
104 | 104 | ), |
105 | 105 | 1 => |
106 | 106 | array ( |
107 | - 'label' => '10', |
|
108 | - 'field' => '30', |
|
107 | + 'label' => '10', |
|
108 | + 'field' => '30', |
|
109 | 109 | ), |
110 | - ), |
|
111 | - 'useTabs' => true, |
|
112 | - 'tabDefs' => |
|
113 | - array ( |
|
110 | + ), |
|
111 | + 'useTabs' => true, |
|
112 | + 'tabDefs' => |
|
113 | + array ( |
|
114 | 114 | 'LBL_TASK_INFORMATION' => |
115 | 115 | array ( |
116 | - 'newTab' => true, |
|
117 | - 'panelDefault' => 'expanded', |
|
116 | + 'newTab' => true, |
|
117 | + 'panelDefault' => 'expanded', |
|
118 | 118 | ), |
119 | 119 | 'LBL_PANEL_ASSIGNMENT' => |
120 | 120 | array ( |
121 | - 'newTab' => true, |
|
122 | - 'panelDefault' => 'expanded', |
|
121 | + 'newTab' => true, |
|
122 | + 'panelDefault' => 'expanded', |
|
123 | + ), |
|
123 | 124 | ), |
124 | - ), |
|
125 | 125 | ), |
126 | 126 | 'panels' => |
127 | 127 | array ( |
128 | - 'lbl_task_information' => |
|
129 | - array ( |
|
128 | + 'lbl_task_information' => |
|
129 | + array ( |
|
130 | 130 | 0 => |
131 | 131 | array ( |
132 | - 0 => |
|
133 | - array ( |
|
132 | + 0 => |
|
133 | + array ( |
|
134 | 134 | 'name' => 'name', |
135 | 135 | 'label' => 'LBL_SUBJECT', |
136 | - ), |
|
137 | - 1 => 'status', |
|
136 | + ), |
|
137 | + 1 => 'status', |
|
138 | 138 | ), |
139 | 139 | 1 => |
140 | 140 | array ( |
141 | - 0 => 'date_start', |
|
142 | - 1 => |
|
143 | - array ( |
|
141 | + 0 => 'date_start', |
|
142 | + 1 => |
|
143 | + array ( |
|
144 | 144 | 'name' => 'parent_name', |
145 | 145 | 'customLabel' => '{sugar_translate label=\'LBL_MODULE_NAME\' module=$fields.parent_type.value}', |
146 | - ), |
|
146 | + ), |
|
147 | 147 | ), |
148 | 148 | 2 => |
149 | 149 | array ( |
150 | - 0 => 'date_due', |
|
151 | - 1 => |
|
152 | - array ( |
|
150 | + 0 => 'date_due', |
|
151 | + 1 => |
|
152 | + array ( |
|
153 | 153 | 'name' => 'contact_name', |
154 | 154 | 'label' => 'LBL_CONTACT', |
155 | - ), |
|
155 | + ), |
|
156 | 156 | ), |
157 | 157 | 3 => |
158 | 158 | array ( |
159 | - 0 => 'priority', |
|
159 | + 0 => 'priority', |
|
160 | 160 | ), |
161 | 161 | 4 => |
162 | 162 | array ( |
163 | - 0 => 'description', |
|
163 | + 0 => 'description', |
|
164 | + ), |
|
164 | 165 | ), |
165 | - ), |
|
166 | - 'LBL_PANEL_ASSIGNMENT' => |
|
167 | - array ( |
|
166 | + 'LBL_PANEL_ASSIGNMENT' => |
|
167 | + array ( |
|
168 | 168 | 0 => |
169 | 169 | array ( |
170 | - 0 => |
|
171 | - array ( |
|
170 | + 0 => |
|
171 | + array ( |
|
172 | 172 | 'name' => 'assigned_user_name', |
173 | 173 | 'label' => 'LBL_ASSIGNED_TO', |
174 | - ), |
|
174 | + ), |
|
175 | 175 | ), |
176 | 176 | 1 => |
177 | 177 | array ( |
178 | - 0 => |
|
179 | - array ( |
|
178 | + 0 => |
|
179 | + array ( |
|
180 | 180 | 'name' => 'date_entered', |
181 | 181 | 'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}', |
182 | 182 | 'label' => 'LBL_DATE_ENTERED', |
183 | - ), |
|
184 | - 1 => |
|
185 | - array ( |
|
183 | + ), |
|
184 | + 1 => |
|
185 | + array ( |
|
186 | 186 | 'name' => 'date_modified', |
187 | 187 | 'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}', |
188 | 188 | 'label' => 'LBL_DATE_MODIFIED', |
189 | - ), |
|
189 | + ), |
|
190 | + ), |
|
190 | 191 | ), |
191 | - ), |
|
192 | 192 | ), |
193 | - ), |
|
193 | + ), |
|
194 | 194 | ); |
195 | 195 | ?> |
@@ -39,131 +39,131 @@ |
||
39 | 39 | |
40 | 40 | $viewdefs ['Tasks'] = |
41 | 41 | array ( |
42 | - 'QuickCreate' => |
|
43 | - array ( |
|
42 | + 'QuickCreate' => |
|
43 | + array ( |
|
44 | 44 | 'templateMeta' => |
45 | 45 | array ( |
46 | - 'form' => |
|
47 | - array ( |
|
46 | + 'form' => |
|
47 | + array ( |
|
48 | 48 | 'hidden' => |
49 | 49 | array ( |
50 | - '<input type="hidden" name="isSaveAndNew" value="false">', |
|
50 | + '<input type="hidden" name="isSaveAndNew" value="false">', |
|
51 | 51 | ), |
52 | 52 | 'buttons' => |
53 | 53 | array ( |
54 | - 'SAVE', |
|
55 | - 'CANCEL', |
|
54 | + 'SAVE', |
|
55 | + 'CANCEL', |
|
56 | 56 | |
57 | - array ( |
|
57 | + array ( |
|
58 | 58 | 'customCode' => '{if $fields.status.value != "Completed"}<input title="{$APP.LBL_CLOSE_AND_CREATE_BUTTON_TITLE}" class="button" onclick="document.getElementById(\'status\').value=\'Completed\'; this.form.action.value=\'Save\'; this.form.return_module.value=\'Tasks\'; 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}', |
59 | - ), |
|
59 | + ), |
|
60 | 60 | ), |
61 | - ), |
|
62 | - 'maxColumns' => '2', |
|
63 | - 'widths' => |
|
64 | - array ( |
|
61 | + ), |
|
62 | + 'maxColumns' => '2', |
|
63 | + 'widths' => |
|
64 | + array ( |
|
65 | 65 | |
66 | 66 | array ( |
67 | - 'label' => '10', |
|
68 | - 'field' => '30', |
|
67 | + 'label' => '10', |
|
68 | + 'field' => '30', |
|
69 | 69 | ), |
70 | 70 | |
71 | 71 | array ( |
72 | - 'label' => '10', |
|
73 | - 'field' => '30', |
|
72 | + 'label' => '10', |
|
73 | + 'field' => '30', |
|
74 | 74 | ), |
75 | - ), |
|
76 | - 'useTabs' => false, |
|
75 | + ), |
|
76 | + 'useTabs' => false, |
|
77 | 77 | ), |
78 | 78 | 'panels' => |
79 | 79 | array ( |
80 | - 'default' => |
|
81 | - array ( |
|
80 | + 'default' => |
|
81 | + array ( |
|
82 | 82 | |
83 | 83 | array ( |
84 | 84 | |
85 | - array ( |
|
85 | + array ( |
|
86 | 86 | 'name' => 'name', |
87 | 87 | 'displayParams' => |
88 | 88 | array ( |
89 | - 'required' => true, |
|
89 | + 'required' => true, |
|
90 | + ), |
|
90 | 91 | ), |
91 | - ), |
|
92 | 92 | |
93 | - array ( |
|
93 | + array ( |
|
94 | 94 | 'name' => 'status', |
95 | 95 | 'displayParams' => |
96 | 96 | array ( |
97 | - 'required' => true, |
|
97 | + 'required' => true, |
|
98 | + ), |
|
98 | 99 | ), |
99 | - ), |
|
100 | 100 | ), |
101 | 101 | |
102 | 102 | array ( |
103 | 103 | |
104 | - array ( |
|
104 | + array ( |
|
105 | 105 | 'name' => 'date_start', |
106 | 106 | 'type' => 'datetimecombo', |
107 | 107 | 'displayParams' => |
108 | 108 | array ( |
109 | - 'showNoneCheckbox' => true, |
|
110 | - 'showFormats' => true, |
|
109 | + 'showNoneCheckbox' => true, |
|
110 | + 'showFormats' => true, |
|
111 | + ), |
|
111 | 112 | ), |
112 | - ), |
|
113 | 113 | |
114 | - array ( |
|
114 | + array ( |
|
115 | 115 | 'name' => 'parent_name', |
116 | 116 | 'label' => 'LBL_LIST_RELATED_TO', |
117 | - ), |
|
117 | + ), |
|
118 | 118 | ), |
119 | 119 | |
120 | 120 | array ( |
121 | 121 | |
122 | - array ( |
|
122 | + array ( |
|
123 | 123 | 'name' => 'date_due', |
124 | 124 | 'type' => 'datetimecombo', |
125 | 125 | 'displayParams' => |
126 | 126 | array ( |
127 | - 'showNoneCheckbox' => true, |
|
128 | - 'showFormats' => true, |
|
127 | + 'showNoneCheckbox' => true, |
|
128 | + 'showFormats' => true, |
|
129 | + ), |
|
129 | 130 | ), |
130 | - ), |
|
131 | 131 | |
132 | - array ( |
|
132 | + array ( |
|
133 | 133 | 'name' => 'contact_name', |
134 | 134 | 'label' => 'LBL_CONTACT_NAME', |
135 | - ), |
|
135 | + ), |
|
136 | 136 | ), |
137 | 137 | |
138 | 138 | array ( |
139 | 139 | |
140 | - array ( |
|
140 | + array ( |
|
141 | 141 | 'name' => 'priority', |
142 | 142 | 'displayParams' => |
143 | 143 | array ( |
144 | - 'required' => true, |
|
144 | + 'required' => true, |
|
145 | + ), |
|
145 | 146 | ), |
146 | - ), |
|
147 | 147 | ), |
148 | - array ( |
|
149 | - array ( |
|
148 | + array ( |
|
149 | + array ( |
|
150 | 150 | 'name' => 'assigned_user_name', |
151 | 151 | 'label' => 'LBL_ASSIGNED_TO_NAME', |
152 | - ), |
|
152 | + ), |
|
153 | 153 | ), |
154 | 154 | array ( |
155 | 155 | |
156 | - array ( |
|
156 | + array ( |
|
157 | 157 | 'name' => 'description', |
158 | 158 | 'displayParams' => |
159 | 159 | array ( |
160 | - 'rows' => 8, |
|
161 | - 'cols' => 60, |
|
160 | + 'rows' => 8, |
|
161 | + 'cols' => 60, |
|
162 | 162 | ), |
163 | - ), |
|
163 | + ), |
|
164 | + ), |
|
164 | 165 | ), |
165 | - ), |
|
166 | 166 | ), |
167 | - ), |
|
167 | + ), |
|
168 | 168 | ); |
169 | 169 | ?> |
@@ -101,9 +101,9 @@ |
||
101 | 101 | 'label' => 'LBL_LIST_STATUS', |
102 | 102 | 'link' => false, |
103 | 103 | 'default' => false), |
104 | - 'DATE_ENTERED' => array ( |
|
105 | - 'width' => '10', |
|
106 | - 'label' => 'LBL_DATE_ENTERED', |
|
107 | - 'default' => true), |
|
104 | + 'DATE_ENTERED' => array ( |
|
105 | + 'width' => '10', |
|
106 | + 'label' => 'LBL_DATE_ENTERED', |
|
107 | + 'default' => true), |
|
108 | 108 | ); |
109 | 109 | ?> |
@@ -60,28 +60,28 @@ discard block |
||
60 | 60 | $role_name = ''; |
61 | 61 | $return= array('module'=>'ACLRoles', 'action'=>'index', 'record'=>''); |
62 | 62 | if(!empty($_REQUEST['record'])){ |
63 | - $role->retrieve($_REQUEST['record']); |
|
64 | - $categories = ACLRole::getRoleActions($_REQUEST['record']); |
|
63 | + $role->retrieve($_REQUEST['record']); |
|
64 | + $categories = ACLRole::getRoleActions($_REQUEST['record']); |
|
65 | 65 | |
66 | - $role_name = $role->name; |
|
67 | - if(!empty($_REQUEST['isDuplicate'])){ |
|
68 | - //role id is stripped here in duplicate so anything using role id after this will not have it |
|
69 | - $role->id = ''; |
|
70 | - }else{ |
|
71 | - $return['record']= $role->id; |
|
72 | - $return['action']='DetailView'; |
|
73 | - } |
|
66 | + $role_name = $role->name; |
|
67 | + if(!empty($_REQUEST['isDuplicate'])){ |
|
68 | + //role id is stripped here in duplicate so anything using role id after this will not have it |
|
69 | + $role->id = ''; |
|
70 | + }else{ |
|
71 | + $return['record']= $role->id; |
|
72 | + $return['action']='DetailView'; |
|
73 | + } |
|
74 | 74 | |
75 | 75 | }else{ |
76 | - $categories = ACLRole::getRoleActions(''); |
|
76 | + $categories = ACLRole::getRoleActions(''); |
|
77 | 77 | } |
78 | 78 | $sugar_smarty->assign('ROLE', $role->toArray()); |
79 | 79 | $tdwidth = 10; |
80 | 80 | |
81 | 81 | if(isset($_REQUEST['return_module'])){ |
82 | - $return['module']=$_REQUEST['return_module']; |
|
83 | - if(isset($_REQUEST['return_action']))$return['action']=$_REQUEST['return_action']; |
|
84 | - if(isset($_REQUEST['return_record']))$return['record']=$_REQUEST['return_record']; |
|
82 | + $return['module']=$_REQUEST['return_module']; |
|
83 | + if(isset($_REQUEST['return_action']))$return['action']=$_REQUEST['return_action']; |
|
84 | + if(isset($_REQUEST['return_record']))$return['record']=$_REQUEST['return_record']; |
|
85 | 85 | } |
86 | 86 | |
87 | 87 | $sugar_smarty->assign('RETURN', $return); |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | ob_clean(); |
97 | 97 | |
98 | 98 | if($_REQUEST['category_name'] == 'All'){ |
99 | - echo $sugar_smarty->fetch('modules/ACLRoles/EditAllBody.tpl'); |
|
99 | + echo $sugar_smarty->fetch('modules/ACLRoles/EditAllBody.tpl'); |
|
100 | 100 | }else{ |
101 | 101 | //WDong Bug 23195: Strings not localized in Role Management. |
102 | 102 | echo getClassicModuleTitle($_REQUEST['category_name'],array($app_list_strings['moduleList'][$_REQUEST['category_name']]), false); |