From e9501b3c2f7cc388d8f1a85777b554699cd156eb Mon Sep 17 00:00:00 2001 From: sinergiacrm Date: Mon, 1 Aug 2022 15:38:22 +0000 Subject: [PATCH 01/53] Fix #9717 - Security Suite Record Group selector doesn't appear when duplicating records --- include/EditView/EditView2.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/EditView/EditView2.php b/include/EditView/EditView2.php index 83ce9a081ab..27943eb1384 100755 --- a/include/EditView/EditView2.php +++ b/include/EditView/EditView2.php @@ -937,7 +937,7 @@ public function display($showTitle = true, $ajaxSave = false) //if popup select add panel if user is a member of multiple groups to metadataFile global $sugar_config; if(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true - && empty($this->focus->fetched_row['id']) && $this->focus->module_dir != "Users" && $this->focus->module_dir != "SugarFeed") { + && (empty($this->focus->fetched_row['id']) || $_REQUEST['isDuplicate'] == true) && $this->focus->module_dir != "Users" && $this->focus->module_dir != "SugarFeed") { //there are cases such as uploading an attachment to an email template where the request module may //not be the same as the current bean module. If that happens we can just skip it From 5377c9c7bb76f3e2961d64ff44440bd9639cff63 Mon Sep 17 00:00:00 2001 From: sinergiacrm Date: Mon, 11 Jul 2022 15:52:36 +0000 Subject: [PATCH 02/53] Fix #9646 - Display TinyMCE in step 4 of the campaigns form wizard --- include/SugarTinyMCE.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/SugarTinyMCE.php b/include/SugarTinyMCE.php index d12dd57e3ca..80d5bc119cb 100755 --- a/include/SugarTinyMCE.php +++ b/include/SugarTinyMCE.php @@ -147,13 +147,13 @@ public function getInstance($targets = "", $type = 'default') {/if} diff --git a/modules/Emails/include/ComposeView/EmailsComposeView.js b/modules/Emails/include/ComposeView/EmailsComposeView.js index 79215878f67..84ab5314f53 100644 --- a/modules/Emails/include/ComposeView/EmailsComposeView.js +++ b/modules/Emails/include/ComposeView/EmailsComposeView.js @@ -1366,6 +1366,41 @@ }); }; + $.fn.EmailsComposeView.onTemplateChange = function (args) { + var confirmed = function (args) { + var args = JSON.parse(args); + var form = $('[name="' + args.form_name + '"]'); + $.post('index.php?entryPoint=emailTemplateData', { + emailTemplateId: args.name_to_value_array.emails_email_templates_idb + }, function (jsonResponse) { + var response = JSON.parse(jsonResponse); + $.fn.EmailsComposeView.loadAttachmentDataFromAjaxResponse(response); + $(form).find('[name="name"]').val(response.data.subject); + tinymce.activeEditor.setContent(response.data.body_from_html, {format: 'html'}); + $.fn.EmailsComposeView.updateSignature(); + }); + set_return(args); + }; + var mb = messageBox(); + mb.setTitle(SUGAR.language.translate('Emails', 'LBL_CONFIRM_APPLY_EMAIL_TEMPLATE_TITLE')); + mb.setBody(SUGAR.language.translate('Emails', 'LBL_CONFIRM_APPLY_EMAIL_TEMPLATE_BODY')); + mb.show(); + + mb.on('ok', function () { + "use strict"; + var id=$('#emails_email_templates_idb').val(); + var name=$('#emails_email_templates_name').val(); + args = JSON.stringify({"form_name":"ComposeView","name_to_value_array":{"emails_email_templates_idb": id,"emails_email_templates_name": name}}) + confirmed(args); + mb.remove(); + }); + + mb.on('cancel', function () { + "use strict"; + mb.remove(); + }); + } + $.fn.EmailsComposeView.onParentSelect = function (args) { set_return(args); if (isValidEmail(args.name_to_value_array.email1)) { From cfa576f1a07213c89d61a3960e2e2b09f46d9d76 Mon Sep 17 00:00:00 2001 From: SinergiaCRM Date: Wed, 14 Sep 2022 14:57:16 +0000 Subject: [PATCH 41/53] Fix salesagility#9768 - Do not convert link URLs in TinyMCE --- include/SuiteEditor/SuiteEditorConnector.php | 1 + modules/Emails/include/ComposeView/EmailsComposeView.js | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/SuiteEditor/SuiteEditorConnector.php b/include/SuiteEditor/SuiteEditorConnector.php index 7370a85b360..c7828c8104c 100644 --- a/include/SuiteEditor/SuiteEditorConnector.php +++ b/include/SuiteEditor/SuiteEditorConnector.php @@ -78,6 +78,7 @@ public static function getSuiteSettings($html, $width) height : '480', plugins: ['code', 'table', 'link', 'image'], toolbar: ['fontselect | fontsizeselect | bold italic underline | forecolor backcolor | styleselect | outdent indent | link image'], + convert_urls: false, }" ); } diff --git a/modules/Emails/include/ComposeView/EmailsComposeView.js b/modules/Emails/include/ComposeView/EmailsComposeView.js index 84ab5314f53..a7a9f3330bb 100644 --- a/modules/Emails/include/ComposeView/EmailsComposeView.js +++ b/modules/Emails/include/ComposeView/EmailsComposeView.js @@ -1422,13 +1422,14 @@ $.fn.EmailsComposeView.defaults = { "tinyMceOptions": { menubar: false, - toolbar: ['fontselect | fontsizeselect | bold italic underline | forecolor backcolor | styleselect | outdent indent'], + plugins: ['link'], + toolbar: ['fontselect | fontsizeselect | bold italic underline | forecolor backcolor | styleselect | outdent indent | link'], formats: { bold: {inline: 'b'}, italic: {inline: 'i'}, underline: {inline: 'u'} }, - convert_urls: true, + convert_urls: false, relative_urls: false, remove_script_host: false, } From d6e2d4c92082e38f29b8b5518aa2dfac19813037 Mon Sep 17 00:00:00 2001 From: Owen Smith Date: Tue, 13 Sep 2022 09:42:02 +0100 Subject: [PATCH 42/53] Fix #9764 - Add extra To addresses to CC field --- modules/Emails/EmailsController.php | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/modules/Emails/EmailsController.php b/modules/Emails/EmailsController.php index 9402ebd089c..813f1aad022 100644 --- a/modules/Emails/EmailsController.php +++ b/modules/Emails/EmailsController.php @@ -777,6 +777,21 @@ public function composeBean($request, $mode = self::COMPOSE_BEAN_MODE_UNDEFINED) $this->bean->parent_name = $parent_name; } + $arrayOfToNames = explode(", ", $this->bean->to_addrs_names); + $mailbox = BeanFactory::getBean('InboundEmail', $this->bean->mailbox_id); + + if(count($arrayOfToNames) > 1){ + foreach($arrayOfToNames as $name){ + if($name !== $mailbox->email_user){ + if(!empty($this->bean->cc_addrs_names)){ + $this->bean->cc_addrs_names .= ', ' .$name; + } else { + $this->bean->cc_addrs_names = $name; + } + } + } + } + if ($mode === self::COMPOSE_BEAN_MODE_REPLY_TO || $mode === self::COMPOSE_BEAN_MODE_REPLY_TO_ALL) { // Move email addresses from the "from" field to the "to" field $this->bean->to_addrs = $this->bean->from_addr; From e8aeed7adf5f7bb7161a35bc2dc148ac799313d6 Mon Sep 17 00:00:00 2001 From: sinergiacrm Date: Fri, 17 Jun 2022 08:21:27 +0000 Subject: [PATCH 43/53] Fix #9621 - Workflows Calculate Field Actions don't translate dynamicenum fields --- modules/AOW_Actions/actions/actionComputeField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/AOW_Actions/actions/actionComputeField.php b/modules/AOW_Actions/actions/actionComputeField.php index 7ffce1c4886..47c426c5e90 100644 --- a/modules/AOW_Actions/actions/actionComputeField.php +++ b/modules/AOW_Actions/actions/actionComputeField.php @@ -153,7 +153,7 @@ private function resolveParameters($bean, $parameters, $parameterTypes) if ($parameterTypes[$i] == actionComputeField::FORMATTED_VALUE) { $dataType = $bean->field_name_map[$parameters[$i]]['type']; - if ($dataType == 'enum') { + if ($dataType == 'enum' || $dataType == 'dynamicenum') { $resolvedParameters[$i] = $GLOBALS['app_list_strings'][$bean->field_defs[$parameters[$i]]['options']][$bean->{$parameters[$i]}]; } else { From d4f82c045f18e228e804e3fec416fd021874baea Mon Sep 17 00:00:00 2001 From: pgorod Date: Wed, 6 Apr 2022 15:38:49 +0100 Subject: [PATCH 44/53] Fix #7759, #8273 - Double compose button in subpanels --- .../SugarWidgetSubPanelTopComposeEmailButton.php | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php index 7f7481abf92..84c8e3f1f5c 100755 --- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php +++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php @@ -101,13 +101,12 @@ public function &_get_form($defines, $additionalFormFields = null, $nonbutton = $emailUI = new EmailUI(); $emailUI->appendTick = false; - $button = ''; + $button = '
'; } return $button; From 0b3a522dd1af2f39ab8a8683580d0df8d4e62cd9 Mon Sep 17 00:00:00 2001 From: = Date: Tue, 7 Feb 2023 20:00:12 +0100 Subject: [PATCH 45/53] Fix #9542 - added checks for count methods --- .../MyPipelineBySalesStageDashlet.php | 6 +++--- .../OpportunitiesByLeadSourceByOutcomeDashlet.php | 6 +++--- .../OpportunitiesByLeadSourceDashlet.php | 4 ++-- .../OutcomeByMonthDashlet/OutcomeByMonthDashlet.php | 2 +- .../PipelineBySalesStageDashlet.php | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php b/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php index b4d8a8c2b88..f6d96a0e36c 100755 --- a/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php +++ b/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php @@ -85,7 +85,7 @@ public function displayOptions() global $app_list_strings; $selected_datax = array(); - if (count($this->mypbss_sales_stages) > 0) { + if (isset($this->mypbss_sales_stages) && count($this->mypbss_sales_stages) > 0) { foreach ($this->mypbss_sales_stages as $key) { $selected_datax[] = $key; } @@ -316,7 +316,7 @@ public function getChartData( $tempx = $user_sales_stage; //set $datax using selected sales stage keys - if (count($tempx) > 0) { + if (isset($tempx) && count($tempx) > 0) { foreach ($tempx as $key) { $datax[$key] = $app_list_strings['sales_stage_dom'][$key]; array_push($selected_datax, $key); @@ -379,7 +379,7 @@ protected function constructQuery() " AND opportunities.date_closed >= ". DBManagerFactory::getInstance()->convert("'".$this->mypbss_date_start."'", 'date'). " AND opportunities.date_closed <= ". DBManagerFactory::getInstance()->convert("'".$this->mypbss_date_end."'", 'date') . " AND opportunities.assigned_user_id = users.id AND opportunities.deleted=0 "; - if (count($this->mypbss_sales_stages) > 0) { + if (isset($this->mypbss_sales_stages) && count($this->mypbss_sales_stages) > 0) { $query .= " AND opportunities.sales_stage IN ('" . implode("','", $this->mypbss_sales_stages) . "') "; } $query .= " GROUP BY opportunities.sales_stage ,users.user_name,opportunities.assigned_user_id"; diff --git a/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php b/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php index 8bcdb5d9603..653cb01ff33 100755 --- a/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php +++ b/modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php @@ -136,7 +136,7 @@ public function display() $url_params = array(); - if (count($this->lsbo_ids) > 0) { + if (isset($this->lsbo_ids) && count($this->lsbo_ids) > 0) { $url_params['assigned_user_id'] = array_values($this->lsbo_ids); } @@ -255,10 +255,10 @@ protected function constructQuery() $query = "SELECT lead_source,sales_stage,sum(amount_usdollar/1000) as total, ". "count(*) as opp_count FROM opportunities "; $query .= " WHERE opportunities.deleted=0 "; - if (count($this->lsbo_ids) > 0) { + if (isset($this->lsbo_ids) && count($this->lsbo_ids) > 0) { $query .= "AND opportunities.assigned_user_id IN ('".implode("','", $this->lsbo_ids)."') "; } - if (count($this->lsbo_lead_sources) > 0) { + if (isset($this->lsbo_lead_sources) && count($this->lsbo_lead_sources) > 0) { $query .= "AND opportunities.lead_source IN ('".implode("','", $this->lsbo_lead_sources)."') "; } else { $query .= "AND opportunities.lead_source IN ('".implode("','", array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') "; diff --git a/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php b/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php index 055c8775c0e..f3627ecc8e1 100755 --- a/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php +++ b/modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php @@ -251,10 +251,10 @@ protected function constructQuery() $query = "SELECT lead_source,sum(amount_usdollar/1000) as total,count(*) as opp_count ". "FROM opportunities "; $query .= "WHERE opportunities.deleted=0 "; - if (count($this->pbls_ids) > 0) { + if (isset($this->pbls_ids) && count($this->pbls_ids) > 0) { $query .= "AND opportunities.assigned_user_id IN ('".implode("','", $this->pbls_ids)."') "; } - if (count($this->pbls_lead_sources) > 0) { + if (isset($this->pbls_lead_sources) && count($this->pbls_lead_sources) > 0) { $query .= "AND opportunities.lead_source IN ('".implode("','", $this->pbls_lead_sources)."') "; } else { $query .= "AND opportunities.lead_source IN ('".implode("','", array_keys($GLOBALS['app_list_strings']['lead_source_dom']))."') "; diff --git a/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php b/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php index 7dfcd67edd3..6c12b260651 100755 --- a/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php +++ b/modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php @@ -249,7 +249,7 @@ protected function constructQuery() $query .= " WHERE opportunities.date_closed >= ".DBManagerFactory::getInstance()->convert("'".$this->obm_date_start."'", 'date') . " AND opportunities.date_closed <= ".DBManagerFactory::getInstance()->convert("'".$this->obm_date_end."'", 'date') . " AND opportunities.deleted=0"; - if (count($this->obm_ids) > 0) { + if (isset($this->obm_ids) && count($this->obm_ids) > 0) { $query .= " AND opportunities.assigned_user_id IN ('" . implode("','", $this->obm_ids) . "')"; } $query .= " GROUP BY sales_stage,". diff --git a/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php b/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php index 6af098c52c7..dbb173ae08d 100755 --- a/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php +++ b/modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php @@ -269,7 +269,7 @@ public function getChartData( $tempx = $user_sales_stage; //set $datax using selected sales stage keys - if (count($tempx) > 0) { + if (isset($tempx) && count($tempx) > 0) { foreach ($tempx as $key) { $datax[$key] = $app_list_strings['sales_stage_dom'][$key]; $selected_datax[] = $key; From ef23047f503db41aeb14690d8eb7679e2678bf4f Mon Sep 17 00:00:00 2001 From: "j.buchanan" Date: Mon, 28 Feb 2022 16:59:23 +0000 Subject: [PATCH 46/53] Fix #9476 - Mass assign security groups only assigns selected on current page Change how UID array is built in assignGroups --- modules/SecurityGroups/AssignGroups.php | 63 +++++++++++++------------ 1 file changed, 33 insertions(+), 30 deletions(-) diff --git a/modules/SecurityGroups/AssignGroups.php b/modules/SecurityGroups/AssignGroups.php index 430a8ec0c62..cfff7a64fba 100755 --- a/modules/SecurityGroups/AssignGroups.php +++ b/modules/SecurityGroups/AssignGroups.php @@ -12,8 +12,8 @@ public function popup_select(&$bean, $event, $arguments) //only process if action is Save (meaning a user has triggered this event and not the portal or automated process) if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'Save' - && isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true - && empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") { + && isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true + && empty($bean->fetched_row['id']) && $bean->module_dir != "Users" && $bean->module_dir != "SugarFeed") { //Upload an attachment to an Email Template and save. If user with multi groups - popup select option //it will redirect to notes instead of EmailTemplate and relationship will fail...check below to avoid if (!empty($_REQUEST['module']) && $_REQUEST['module'] != $bean->module_dir) { @@ -26,7 +26,7 @@ public function popup_select(&$bean, $event, $arguments) //sanity check if (in_array($bean->module_dir, array_keys($security_modules))) { //add each group in securitygroup_list to new record - $rel_name = SecurityGroup::getLinkName($bean->module_dir,"SecurityGroups"); + $rel_name = SecurityGroup::getLinkName($bean->module_dir, "SecurityGroups"); $bean->load_relationship($rel_name); foreach ($_REQUEST['securitygroup_list'] as $group_id) { @@ -42,8 +42,8 @@ public function popup_select(&$bean, $event, $arguments) $_SESSION['securitysuite_error'] = $ss_mod_strings['LBL_ERROR_DUPLICATE']; } } elseif (isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true - && empty($bean->fetched_row['id']) && $bean->module_dir == "Users" - && isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature') { //Bug: 589 + && empty($bean->fetched_row['id']) && $bean->module_dir == "Users" + && isset($_REQUEST['action']) && $_REQUEST['action'] != 'SaveSignature') { //Bug: 589 //$_REQUEST['return_module'] = $bean->module_dir; //$_REQUEST['return_action'] = "DetailView"; @@ -55,9 +55,9 @@ public function popup_select(&$bean, $event, $arguments) $_SESSION['securitygroups_popup'] = array(); } $_SESSION['securitygroups_popup'][] = array( - 'module' => $bean->module_dir, - 'id' => $bean->id - ); + 'module' => $bean->module_dir, + 'id' => $bean->id + ); } } @@ -69,9 +69,9 @@ public function popup_onload($event, $arguments) } /** //test user popup - //always have this loaded - echo ''; - */ + * //always have this loaded + * echo ''; + */ global $sugar_config; $action = null; @@ -94,14 +94,14 @@ public function popup_onload($event, $arguments) } if (( - //(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true) - //|| + //(isset($sugar_config['securitysuite_popup_select']) && $sugar_config['securitysuite_popup_select'] == true) + //|| ($module == "Users" && isset($sugar_config['securitysuite_user_popup']) && $sugar_config['securitysuite_user_popup'] == true) - ) + ) - //&& isset($_SESSION['securitygroups_popup_'.$module]) && !empty($_SESSION['securitygroups_popup_'.$module]) - && !empty($_SESSION['securitygroups_popup']) - ) { + //&& isset($_SESSION['securitygroups_popup_'.$module]) && !empty($_SESSION['securitygroups_popup_'.$module]) + && !empty($_SESSION['securitygroups_popup']) + ) { foreach ($_SESSION['securitygroups_popup'] as $popup_index => $popup) { $record_id = $popup['id']; $module = $popup['module']; @@ -111,7 +111,7 @@ public function popup_onload($event, $arguments) if ($module == 'Users') { $rel_name = "SecurityGroups"; } else { - $rel_name = SecurityGroup::getLinkName($module,"SecurityGroups"); + $rel_name = SecurityGroup::getLinkName($module, "SecurityGroups"); } //this only works if on the detail view of the record actually saved... @@ -144,13 +144,13 @@ public function mass_assign($event, $arguments) LoggerManager::getLogger()->warn('Not defined module in request'); } - - $no_mass_assign_list = array("Emails"=>"Emails","ACLRoles"=>"ACLRoles"); //,"Users"=>"Users"); + + $no_mass_assign_list = array("Emails" => "Emails", "ACLRoles" => "ACLRoles"); //,"Users"=>"Users"); //check if security suite enabled $action = strtolower($action); if (isset($module) && ($action == "list" || $action == "index" || $action == "listview") - && (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true) - && !array_key_exists($module, $no_mass_assign_list) + && (!isset($_REQUEST['search_form_only']) || $_REQUEST['search_form_only'] != true) + && !array_key_exists($module, $no_mass_assign_list) ) { global $current_user; if (is_admin($current_user) || ACLAction::getUserAccessLevel($current_user->id, "SecurityGroups", 'access') == ACL_ALLOW_ENABLED) { @@ -167,14 +167,14 @@ public function mass_assign($event, $arguments) $form_header = get_form_header($current_module_strings['LBL_MASS_ASSIGN'], '', false); $groups = $groupFocus->get_list("name", "", 0, -99, -99); - $options = array(""=>""); + $options = array("" => ""); foreach ($groups['list'] as $group) { $options[$group->id] = $group->name; } - $group_options = get_select_options_with_id($options, ""); + $group_options = get_select_options_with_id($options, ""); - $export_where = !empty($_SESSION['export_where']) ? $_SESSION['export_where'] : ''; - $export_where_md5 = md5($export_where); + $export_where = !empty($_SESSION['export_where']) ? $_SESSION['export_where'] : ''; + $export_where_md5 = md5($export_where); $mass_assign = << Date: Fri, 22 Oct 2021 13:42:46 +0200 Subject: [PATCH 47/53] Fix #9326 - Adding decimal and float case option for export to use user-defined decimal separator --- include/export_utils.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/export_utils.php b/include/export_utils.php index 56b18a01cec..4d5e7f0c56b 100755 --- a/include/export_utils.php +++ b/include/export_utils.php @@ -299,6 +299,13 @@ function export($type, $records = null, $members = false, $sample=false) require_once('modules/Currencies/Currency.php'); $value = currency_format_number($value); break; + // Fix Issue 9326 - Adding Decimal and Float case to retrieve user-defined decimal separator + case 'decimal': + case 'float': + $user_dec_sep = (!empty($current_user->id) ? $current_user->getPreference('dec_sep') : null); + $dec_sep = empty($user_dec_sep) ? $sugar_config['default_decimal_seperator'] : $user_dec_sep; + $value = str_replace('.', $dec_sep, $value); + break; //if our value is a datetime field, then apply the users locale case 'datetime': From 3a3e5e4af4870462056c94323cfd9e0dbda6fd58 Mon Sep 17 00:00:00 2001 From: sinergiacrm Date: Wed, 26 Jan 2022 15:07:40 +0100 Subject: [PATCH 48/53] Fix #9470 - Set fdow in Calendar popup date selector --- include/MassUpdate.php | 11 ++++++----- .../Fields/Datetimecombo/RangeSearchForm.tpl | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/MassUpdate.php b/include/MassUpdate.php index acc421aa9f6..dd70f490323 100755 --- a/include/MassUpdate.php +++ b/include/MassUpdate.php @@ -1238,17 +1238,17 @@ public function addStatusMulti($displayname, $varname, $options) */ public function addDate($displayname, $varname) { - global $timedate; + global $timedate, $app_strings, $app_list_strings, $theme, $current_user; //letrium ltd $displayname = addslashes($displayname); $userformat = '(' . $timedate->get_user_date_format() . ')'; $cal_dateformat = $timedate->get_cal_date_format(); - global $app_strings, $app_list_strings, $theme; + $cal_fdow = $current_user->get_first_day_of_week() ? $current_user->get_first_day_of_week() : '0'; $javascriptend = << Calendar.setup ({ - inputField : "${varname}jscal_field", daFormat : "$cal_dateformat", ifFormat : "$cal_dateformat", showsTime : false, button : "${varname}jscal_trigger", singleClick : true, step : 1, weekNumbers:false + inputField : "${varname}jscal_field", daFormat : "$cal_dateformat", ifFormat : "$cal_dateformat", showsTime : false, button : "${varname}jscal_trigger", singleClick : true, step : 1, startWeekday: $cal_fdow, weekNumbers:false }); EOQ; @@ -1296,10 +1296,10 @@ public function addRadioenum($displayname, $varname, $options) */ public function addDatetime($displayname, $varname) { - global $timedate; + global $timedate, $app_strings, $app_list_strings, $theme, $current_user; $userformat = $timedate->get_user_time_format(); $cal_dateformat = $timedate->get_cal_date_format(); - global $app_strings, $app_list_strings, $theme; + $cal_fdow = $current_user->get_first_day_of_week() ? $current_user->get_first_day_of_week() : '0'; $javascriptend = << Date: Fri, 22 Oct 2021 14:13:40 +0200 Subject: [PATCH 49/53] Fix #8897 - Adding missing relationship for SurveyResponses module --- modules/SurveyResponses/vardefs.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/SurveyResponses/vardefs.php b/modules/SurveyResponses/vardefs.php index 58e55090985..3be481ec73d 100644 --- a/modules/SurveyResponses/vardefs.php +++ b/modules/SurveyResponses/vardefs.php @@ -217,6 +217,25 @@ 'lhs_key' => 'id', 'relationship_type' => 'one-to-many', ), + // Fix Issue 8897 - Adding missing relationships to SurveyResponses and Contacts/Accounts + 'surveyresponses_contacts' => array( + 'rhs_module' => 'SurveyResponses', + 'rhs_table' => 'surveyresponses', + 'rhs_key' => 'contact_id', + 'lhs_module' => 'Contacts', + 'lhs_table' => 'contacts', + 'lhs_key' => 'id', + 'relationship_type' => 'one-to-many', + ), + 'surveyresponses_accounts' => array ( + 'rhs_module' => 'SurveyResponses', + 'rhs_table' => 'surveyresponses', + 'rhs_key' => 'account_id', + 'lhs_module' => 'Accounts', + 'lhs_table' => 'accounts', + 'lhs_key' => 'id', + 'relationship_type' => 'one-to-many', + ), ), 'optimistic_locking' => true, 'unified_search' => true, From 5485da843d9f9d0dcfe2eeb1a8511637fa8e638c Mon Sep 17 00:00:00 2001 From: SinergiaCRM <61022311+SinergiaCRM@users.noreply.github.com> Date: Fri, 22 Oct 2021 13:19:51 +0200 Subject: [PATCH 50/53] Fix #9153 - Adding dynamicenum case option for export --- include/export_utils.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/export_utils.php b/include/export_utils.php index 4d5e7f0c56b..36b54745f70 100755 --- a/include/export_utils.php +++ b/include/export_utils.php @@ -333,7 +333,9 @@ function export($type, $records = null, $members = false, $sample=false) $value = implode(",", $valueArray); break; - + + // Fix Issue 9153 - Exporting DynamicDropdown fields return keys + case 'dynamicenum': case 'enum': if (isset($focus->field_name_map[$fields_array[$key]]['options']) && isset($app_list_strings[$focus->field_name_map[$fields_array[$key]]['options']]) && From c7f5ea68060039af284de53417b7b7ad604abe54 Mon Sep 17 00:00:00 2001 From: "j.buchanan" Date: Mon, 3 Apr 2023 17:24:07 +0100 Subject: [PATCH 51/53] Fix #10009 - Cannot configure Module Menu Filters on PHP8+ Make object instead of calling function statically --- modules/Studio/SaveTabs.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/Studio/SaveTabs.php b/modules/Studio/SaveTabs.php index b9ecd8daf1a..d446c1aa2af 100755 --- a/modules/Studio/SaveTabs.php +++ b/modules/Studio/SaveTabs.php @@ -45,7 +45,8 @@ require_once('modules/Studio/TabGroups/TabGroupHelper.php'); -TabGroupHelper::saveTabGroups($_POST); +$tg = new TabGroupHelper(); +$tg->saveTabGroups($_POST); ob_clean(); if (!empty($_POST['grouptab_lang'])) { header('Location: index.php?module=Studio&action=TabGroups&lang='.$_POST['grouptab_lang']); From 4773d6029bc42def874de6d7b39d5f30f6175fb1 Mon Sep 17 00:00:00 2001 From: Jack Anderson Date: Fri, 21 Apr 2023 16:07:09 +0100 Subject: [PATCH 52/53] SuiteCRM 7.12.11 Release --- .github/SECURITY.md | 16 ++--------- README.md | 2 +- composer.lock | 16 +++++++---- files.md5 | 68 ++++++++++++++++++++++---------------------- suitecrm_version.php | 4 +-- 5 files changed, 49 insertions(+), 57 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 9d151e57afb..eabe471e4cb 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -2,20 +2,8 @@ ## Supported Versions -For a complete compatibility matrix, please see the documentation [here](https://docs.suitecrm.com/admin/compatibility-matrix/). - -| Version | Supported | -| ------- | ------------------ | -| 7.11.x | :heavy_check_mark: | -| 7.10.x | :heavy_check_mark: | -| ≤7.8.x | :x: | +For a list of supported versions, please see the documentation [Supported Versions](https://docs.suitecrm.com/community/supported-versions/) page. ## Reporting a Vulnerability -We take Security seriously here at SuiteCRM so if you have discovered a security risk report it by -emailing [security@suitecrm.com](mailto:security@suitecrm.com). This will be delivered to the product team who handle security issues. -Please don't disclose security bugs publicly until they have been handled by the security team. - -Your email will be acknowledged within 24 hours during the business week (Mon - Fri), and you’ll receive a more -detailed response to your email within 72 hours during the business week (Mon - Fri) indicating the next steps in -handling your report. +For details on how to report a vulnerability please check our [Security Policy](https://docs.suitecrm.com/community/security-policy/) page. diff --git a/README.md b/README.md index 58d0e973d66..4fefb45e65d 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ -# SuiteCRM 7.12.10 +# SuiteCRM 7.12.11 [![Build Status](https://travis-ci.org/salesagility/SuiteCRM.svg?branch=hotfix)](https://travis-ci.org/salesagility/SuiteCRM) [![codecov](https://codecov.io/gh/salesagility/SuiteCRM/branch/hotfix/graph/badge.svg)](https://codecov.io/gh/salesagility/SuiteCRM/branch/hotfix) diff --git a/composer.lock b/composer.lock index d98c83a50c0..c029f10358c 100644 --- a/composer.lock +++ b/composer.lock @@ -2512,16 +2512,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.17", + "version": "3.0.19", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761" + "reference": "cc181005cf548bfd8a4896383bb825d859259f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/dbc2307d5c69aeb22db136c52e91130d7f2ca761", - "reference": "dbc2307d5c69aeb22db136c52e91130d7f2ca761", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cc181005cf548bfd8a4896383bb825d859259f95", + "reference": "cc181005cf548bfd8a4896383bb825d859259f95", "shasum": "" }, "require": { @@ -2600,6 +2600,10 @@ "x.509", "x509" ], + "support": { + "issues": "https://github.com/phpseclib/phpseclib/issues", + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.19" + }, "funding": [ { "url": "https://github.com/terrafrost", @@ -2614,7 +2618,7 @@ "type": "tidelift" } ], - "time": "2022-10-24T10:51:50+00:00" + "time": "2023-03-05T17:13:09+00:00" }, { "name": "pimple/pimple", @@ -10116,5 +10120,5 @@ "platform-overrides": { "php": "7.3.0" }, - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.3.0" } diff --git a/files.md5 b/files.md5 index 5693c085236..2d75ef4357a 100755 --- a/files.md5 +++ b/files.md5 @@ -1,5 +1,5 @@ '69a1e7b3d7755a2a63499a16ddae81cf', './Api/Core/Config/slim.php' => 'b134e68765e6a1403577e2a5a06322b8', @@ -116,7 +116,7 @@ $md5_string = array ( './ModuleInstall/PackageManager/tpls/PackageManagerLicense.tpl' => 'df5e267d1df5ce08fb9406e42d5b4816', './ModuleInstall/PackageManager/tpls/PackageManagerScripts.tpl' => '98e396c0aa57329731fda19c790fffb2', './ModuleInstall/extensions.php' => '094f4650261f6efbab1b90b119829388', - './README.md' => 'e98c90b6811716cb960fd6c0eba91c30', + './README.md' => '5ffcf8bd7f5cc1a1a375b4f151d5ba4a', './RoboFile.php' => '045b82c1df69553824d0e4ffcce6e03c', './SugarSecurity.php' => '47e316b2d408e8c5192c8ea4a4f921b3', './TreeData.php' => '32873e20cb5fd33f9d1cdaf18c3cac5c', @@ -508,7 +508,7 @@ $md5_string = array ( './build/travis-ci-apache' => 'e1e212c4eaf679b6ec620cd0b12f4571', './campaign_tracker.php' => '321e43ca8b664e6ca57ae5589e8c0667', './composer.json' => 'db3d5c1d78b364766bf171d0374b23f3', - './composer.lock' => '4dfc00b65f008f201f1b6722981bf915', + './composer.lock' => '71f1888fa56bc25960c9479bdc6f7de4', './cron.php' => '0b8b6bd839a2232a8da074b31feaa708', './crossdomain.xml' => '24b7711640c652b21aa89c9d83d6ec13', './data/BeanFactory.php' => '3007bf65ebc77baa76c338ce6a068790', @@ -664,7 +664,7 @@ $md5_string = array ( './include/MVC/View/views/view.vcard.php' => 'e7bddb455a4f14ad36ecde6470c71b68', './include/MVC/View/views/view.xml.php' => '2a7ed1f6384a9c362c4a61f5d7d8b8d2', './include/MVC/preDispatch.php' => 'f1720fa7dea86c02e0663227c2c08203', - './include/MassUpdate.php' => 'e1e7bb76e9479209bc9fdb54411eae97', + './include/MassUpdate.php' => '31962debf6e06728dff2e7e8f1b59310', './include/MySugar/DashletsDialog/DashletsDialog.php' => '0b7c1af1bb21b3af9b735178de2f3a89', './include/MySugar/MySugar.php' => 'eaffdea2231df9ec4a457fb57d499ca4', './include/MySugar/dashboardstyle.css' => '4cce65e52281263e484140a1d4b8d2e2', @@ -909,7 +909,7 @@ $md5_string = array ( './include/SugarFields/Fields/Datetime/SugarFieldDatetime.php' => 'b8af991b751ff491d59598e131496081', './include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => '943fe4f97ca790d58abeedcfb704d3e4', './include/SugarFields/Fields/Datetimecombo/EditView.tpl' => '08ec47bdf15639c759cab09a00b09070', - './include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl' => '8c2e3b3d4ba9a274bac3cec52d8ab452', + './include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl' => 'c1e863e4edb0152dfb3936bb6bf7ae90', './include/SugarFields/Fields/Datetimecombo/SearchView.tpl' => 'ed305267b63968f4f603154ad7344a79', './include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php' => '73008c0cdd41970570617b3f5a5dbfd0', './include/SugarFields/Fields/Download/DetailView.tpl' => 'e05dbaa1b573284715b870612087e6cb', @@ -1218,7 +1218,7 @@ $md5_string = array ( './include/Sugarpdf/sugarpdf/sugarpdf.smarty.php' => '3123177f2bb0240b00e37c433d149c66', './include/Sugarpdf/sugarpdf_config.php' => '01452207250f2f90396b4543eeecfde6', './include/Sugarpdf/sugarpdf_default.php' => 'ed59f131878639034df56183b7a121a2', - './include/SuiteEditor/SuiteEditorConnector.php' => '30ded6167f0dd3abda0f18487659633b', + './include/SuiteEditor/SuiteEditorConnector.php' => 'a776d9b9a8512fa5f5b00c4c9c417698', './include/SuiteEditor/SuiteEditorDirectHTML.php' => 'b5f7f66a383397e4a541e0ce51fef039', './include/SuiteEditor/SuiteEditorInterface.php' => 'cdf72097a74c1ca0bf8cbd2f4b5cdb8e', './include/SuiteEditor/SuiteEditorMozaik.php' => 'a44e4f678cbcaf8c823486be62ab98a3', @@ -1296,7 +1296,7 @@ $md5_string = array ( './include/SuiteGraphs/rgraph/scripts/jsmin' => '9631c7fbf2f120539f148a7550209634', './include/SuiteGraphs/rgraph/scripts/jsmin.txt' => '9d43948e40a94c857c47a869da01d385', './include/SuiteMozaik.php' => '8060bf6d838174cfa0df04e311a6f8a7', - './include/TemplateHandler/TemplateHandler.php' => '80f3e44aebe28d25481f3a45f24c1926', + './include/TemplateHandler/TemplateHandler.php' => 'f815b572b2c4db21a58c9ab698416a21', './include/TestCaseAbstract.php' => '4a9fb42e6c0229f8c8101183320e17bf', './include/TimeDate.php' => '7dabddc78edd8048ed129b080a488579', './include/URIFilter.php' => 'bafc11e1aab5f2eb3839569f5109ee63', @@ -1341,7 +1341,7 @@ $md5_string = array ( './include/dir_inc.php' => '4ec954313ef7c8b164ec1232a1ec1bd7', './include/entryPoint.php' => '6c03ccc488eae94ac702743421951115', './include/entryPointConfirmOptInConnector.php' => '66fed04564c4f4182f3b277d5b6dfafc', - './include/export_utils.php' => 'b8144b36a084682de435bfa26a66259b', + './include/export_utils.php' => 'df002a2d86a9c87cb985e06bc3f09ff3', './include/externalAPI/Base/ExternalAPIBase.php' => 'e52639773bbdaa1d9e3308fd7a41e392', './include/externalAPI/Base/ExternalAPIPlugin.php' => '9f8d318d518a9f950fd0d80a6bac7c20', './include/externalAPI/Base/ExternalOAuthAPIPlugin.php' => 'fd065e2de29e6fa0dfc86956e2c86230', @@ -1434,7 +1434,7 @@ $md5_string = array ( './include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php' => '73ebbe4637525a45798ba4e0d5c365d9', './include/generic/SugarWidgets/SugarWidgetSubPanelTopButtonQuickCreate.php' => '6946d51342aebdc39995af316bea01c5', './include/generic/SugarWidgets/SugarWidgetSubPanelTopButton_c.php' => '4ac7dc01f8edc3ba751645cd14c11da5', - './include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php' => '8b4d187c36d140ad08bcf9675d3ec750', + './include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php' => '7067242d738d9fa30c6a1ef575f30984', './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateAccountNameButton.php' => '7c8026d84033b772fb86a537e5f5220f', './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php' => 'ec6f42ed41fdba39de226e44a0041aec', './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignMarketingEmailButton.php' => 'abe7be4f90fdf815b3d59687dd0823b5', @@ -1496,7 +1496,7 @@ $md5_string = array ( './include/images/tour/profile_link.png' => '672c8e5595b6beb00b29d4cf7360ca59', './include/images/university.png' => 'd779a477591af9d7236120e86647e7df', './include/images/university2.png' => '346083109b89352e3a4b77cc249c56df', - './include/javascript/EmailsComposeViewModal.js' => 'f3e5e7623ee85de221dd60d3c7cfcb3f', + './include/javascript/EmailsComposeViewModal.js' => '18ba828fcff89d1e5828eb7f7f0fd940', './include/javascript/ajaxUI.js' => '35ec428357ec0b09e18594c631fa7e3f', './include/javascript/alerts.js' => '5c5a51e2923a0977b83eaa2548382f8d', './include/javascript/bindWithDelay.js' => '9e9858d872371595cc135dad5ae079ee', @@ -1675,7 +1675,7 @@ $md5_string = array ( './include/javascript/quickCompose.js' => '047d7eea0263fa0c2cd9bdb53ecf6258', './include/javascript/quicksearch.js' => '97475c83c2614b54f3a0dd63edb2dfb2', './include/javascript/report_additionals.js' => '094fef2462c9d640ee3ef4dc7af613d0', - './include/javascript/sugar_3.js' => '37dafba08d7a447439882819e54de1e1', + './include/javascript/sugar_3.js' => '48d96546feac5b8f58f9ce0f551f1ab6', './include/javascript/sugar_connection_event_listener.js' => 'c8a148e865988e17f9b0328de44803a7', './include/javascript/sugar_yui_overrides.js' => 'd99ea792b967d53cef54e0b870acdd88', './include/javascript/sugarwidgets/SugarYUILoader.js' => '959d552199b65eab09ed534ade65b064', @@ -2391,7 +2391,7 @@ $md5_string = array ( './include/utils/recaptcha_utils.php' => '73f5eddf707788c1dff4b7d07dc82656', './include/utils/security_utils.php' => 'e953d0b673df3df313ecf1ac975e8f57', './include/utils/sugar_file_utils.php' => '1c1915cad8c88feb0edbf5bbaee106c4', - './include/utils.php' => '808f43a73b630ececea3044f4be83248', + './include/utils.php' => '2c84878c356ec1e2df3b3c3ed5fb4391', './include/vCard.php' => '44052bbedcdaba3fdf67cfc10a112e75', './include/ytree/ExtNode.php' => '000d4ccbdb6e0a7628c636128781b5e3', './include/ytree/JQueryTree.php' => '3712d2224b93818b990b876f8405b745', @@ -2541,7 +2541,7 @@ $md5_string = array ( './jssource/src_files/include/SugarFields/Fields/File/SugarFieldFile.js' => '5673fcbe388ef5af0fe7eca8dddf68d9', './jssource/src_files/include/SugarFields/Fields/Time/Time.js' => '22a9dadf3e02d6c7ee71b3d50639fc10', './jssource/src_files/include/connectors/formatters/default/company_detail.js' => 'c0225f1761182495ea499b5dcbc60efa', - './jssource/src_files/include/javascript/EmailsComposeViewModal.js' => '51b2ed7cb42b4198e4c5ecb438c56bcb', + './jssource/src_files/include/javascript/EmailsComposeViewModal.js' => '74dd4532c759be8c557b5acc3d777159', './jssource/src_files/include/javascript/ajaxUI.js' => 'fd171bf28ec63478d1518753b48d1a6f', './jssource/src_files/include/javascript/alerts.js' => '4cc19550e5d856a240b80c6317666eee', './jssource/src_files/include/javascript/calendar.js' => 'ca77fc30f0070b4ffbfa48cef294a76f', @@ -2564,7 +2564,7 @@ $md5_string = array ( './jssource/src_files/include/javascript/quickCompose.js' => '31c8e3efcf325c0c805018587fa585cb', './jssource/src_files/include/javascript/quicksearch.js' => '0329400df3d1b8e4eab0765f8fe9f2e4', './jssource/src_files/include/javascript/report_additionals.js' => 'baca991df446eaf401dda47d1685fad1', - './jssource/src_files/include/javascript/sugar_3.js' => '1013320f0f4e078b999641d94e979fb6', + './jssource/src_files/include/javascript/sugar_3.js' => '15dfff1263d8a457efcf57545bf450bd', './jssource/src_files/include/javascript/sugar_connection_event_listener.js' => '431e88e62c5a7005693189d1e9d8e916', './jssource/src_files/include/javascript/sugar_yui_overrides.js' => 'efbf74aa5e7d0af070ae7faab7725538', './jssource/src_files/include/javascript/sugarwidgets/SugarYUILoader.js' => 'abc59adf77cf85c0424dbcb6c356bee8', @@ -2593,7 +2593,7 @@ $md5_string = array ( './jssource/src_files/modules/Accounts/Account.js' => '6d64bb3ea8c66d71c154ba70cca2e118', './jssource/src_files/modules/Administration/javascript/Administration.js' => 'd6ceb885790e2541eecfec634e6ab255', './jssource/src_files/modules/Administration/javascript/Async.js' => 'f062dbc229f6307d094319abaebb2c7c', - './jssource/src_files/modules/Calendar/Cal.js' => '3b871a0b63105ae7a682fb4bfa2fc523', + './jssource/src_files/modules/Calendar/Cal.js' => '4a93979d5a83795c93084c548e476d3a', './jssource/src_files/modules/Campaigns/DetailView.js' => '1396aec60d5e7a6737c455c4d8b39200', './jssource/src_files/modules/Campaigns/WebToLead.js' => 'e64509ddd0e0ff5bc5cfbeaaae358883', './jssource/src_files/modules/Campaigns/wizard.js' => 'a4f7ae104e285c343542a99ce42b7770', @@ -3548,13 +3548,13 @@ $md5_string = array ( './modules/AOS_Quotes/views/view.detail.php' => '7050a7beda6b696f1bc19dc5da86d2bd', './modules/AOS_Quotes/views/view.edit.php' => 'd7febe2bec502ba7d36aa5d4d8d6207c', './modules/AOW_Actions/AOW_Action.php' => '4dbe91f2bac732292e9992f89a73b852', - './modules/AOW_Actions/FormulaCalculator.php' => 'b8e36954646d4716949264e2fc2808af', + './modules/AOW_Actions/FormulaCalculator.php' => 'ca0ad3d6019656144ae5666f79067790', './modules/AOW_Actions/actionLines.js' => 'de3626663801a14f67f46649d6983fd6', './modules/AOW_Actions/actionLines.php' => '6bb52c4830237a808c51e18b8c7e954c', './modules/AOW_Actions/actions/actionBase.php' => 'cc44a21a3198ee703b0390c7df0bcf49', './modules/AOW_Actions/actions/actionComputeField.css' => '4f63069fbf5aee464d8b0f24e7049276', './modules/AOW_Actions/actions/actionComputeField.js' => '2f39d2288a3dbe7dc85b3b185ce1fdc5', - './modules/AOW_Actions/actions/actionComputeField.php' => '81159ddc7e2d91425e9db4fbea2ef075', + './modules/AOW_Actions/actions/actionComputeField.php' => '680aa3489a3af38d4586f9d57a04fe9f', './modules/AOW_Actions/actions/actionCreateRecord.js' => 'd74993b3fd078cbd54a445c6b3470eda', './modules/AOW_Actions/actions/actionCreateRecord.php' => '537fbede6eeb62ac3ba1e5e77c6e4ada', './modules/AOW_Actions/actions/actionModifyRecord.php' => 'a382c7b13f2896df64d70055ad92b2d0', @@ -3835,7 +3835,7 @@ $md5_string = array ( './modules/Bugs/vardefs.php' => '855c5012b57a7060f7c62cd437532019', './modules/Bugs/views/view.detail.php' => 'cf1a69a74ff14047728196953d63e53b', './modules/Bugs/views/view.edit.php' => 'f406f3c7f19e15cd646373151994fa1c', - './modules/Calendar/Cal.js' => '106379c83260c2472f7c65114d7a9fdb', + './modules/Calendar/Cal.js' => 'bc6138c43cd476b7b51b084745f54cf5', './modules/Calendar/Calendar.php' => '8b5970e1adbf735e0d7f5222012f48ec', './modules/Calendar/CalendarActivity.php' => '9e55048969b6abcb58443296057f8fce', './modules/Calendar/CalendarDisplay.php' => 'fd05f849dff1db7bb47713be26e6a3d2', @@ -4013,7 +4013,7 @@ $md5_string = array ( './modules/CampaignLog/metadata/subpanels/default.php' => '9383d139ae417578b7c03083b9e6ba2a', './modules/CampaignLog/vardefs.php' => '0279a427e36779734ca01a0e5cbe0cc5', './modules/CampaignTrackers/CampaignTracker.php' => 'da574620bcf7b37822c4e6bb581f1f08', - './modules/CampaignTrackers/DetailView.html' => 'ada3001b4092fc1dabbce8b8e7ac1452', + './modules/CampaignTrackers/DetailView.html' => '8cb6bb4cd9751f106908cde8530b857e', './modules/CampaignTrackers/DetailView.php' => '6c3394e0140f5f5f0db95d392a4deb55', './modules/CampaignTrackers/EditView.html' => '3487ab500ce49be8c7bca18661aae85b', './modules/CampaignTrackers/EditView.php' => '32b4ad96e104b9ef6c8de33941a44b94', @@ -4157,27 +4157,27 @@ $md5_string = array ( './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.data.php' => 'db145e4a88bb0123a85711fc11086944', './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php' => '37653e556058a7d870d9068d0cb6ba66', './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.meta.php' => '653575a48fa00ea0f255b77d1c71b1cf', - './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php' => 'a15176af7907c7bb663ef129dfd9480e', + './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php' => '9657e9b2f8a1c7f22ace761b9ac7d7bb', './modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeConfigure.tpl' => 'fc2d41ca60cc48e8aaadeff33b86a382', './modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.data.php' => 'f48481748e948d7e34f5f4d107337cf0', './modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.en_us.lang.php' => '2cd6f4ad46a1ab7d5eda7fd7b0fc74ac', './modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.meta.php' => 'bcf1fd2ac113bdc8fcd2f6e96c51a003', - './modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php' => 'd10584b71ecae05337e09416a8e6d5bd', + './modules/Charts/Dashlets/OpportunitiesByLeadSourceByOutcomeDashlet/OpportunitiesByLeadSourceByOutcomeDashlet.php' => '05b29826395af568d7e4ee5c835c0438', './modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceConfigure.tpl' => '2cf2e807cc447c1598aea3d505cc75ab', './modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.data.php' => '0218cf7d787951c29c1f3b04dca27951', './modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.en_us.lang.php' => 'edd88945059f81c532d016f95444a98a', './modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.meta.php' => 'bf1bb6cd51103d14eeacaff384e40b8f', - './modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php' => 'a04d3590123fedf06307669ae9532645', + './modules/Charts/Dashlets/OpportunitiesByLeadSourceDashlet/OpportunitiesByLeadSourceDashlet.php' => '02e47ce89a90cf141b5454dcfd5074d8', './modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthConfigure.tpl' => '7ad6e7c4257461f7feee56097396246c', './modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.data.php' => '16949b783f0a69792b6835e71c5c9603', './modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.en_us.lang.php' => 'eee5d2fd10a5dcb2894534c62a76e8ad', './modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.meta.php' => '70ea288301c466bb9ee60f20d51b8d41', - './modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php' => '39825a53b6d4bb9be403cd3f352fc80a', + './modules/Charts/Dashlets/OutcomeByMonthDashlet/OutcomeByMonthDashlet.php' => 'b0111e98d1b6fc34f28839ae8f80d002', './modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageConfigure.tpl' => '3c086ab793adc64ffff1bbbcf18ee44f', './modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.data.php' => '98c44d741c97fa63549c1177c063c582', './modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.en_us.lang.php' => '126f0a5dcb381d4f7fc057cd7bb7fc45', './modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.meta.php' => '4ae341b9fb86bae9af35a6025a212bdc', - './modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php' => '394769d6159a0e3ff8ab077193ba94b8', + './modules/Charts/Dashlets/PipelineBySalesStageDashlet/PipelineBySalesStageDashlet.php' => 'd0eae425809765cabaf12ebe4e4bc09c', './modules/Charts/Dashlets/PredefinedChartDashletScript.tpl' => 'a84073e4b5722d39e693f023eb7813b1', './modules/Charts/DynamicAction.php' => '6c9664747a453c6ee31a4fd782e9b485', './modules/Charts/PredefinedChart.php' => 'd0dda7dc2f45335974c808153a5a8eed', @@ -4576,7 +4576,7 @@ $md5_string = array ( './modules/Emails/EmailUI.php' => 'f8b37b1db23d7baaa64d8eb4a99d2d02', './modules/Emails/EmailUIAjax.php' => '474940d575ae666cd0b00437f75e76d4', './modules/Emails/EmailValidatorException.php' => 'cb225382f8842456d005769be4f3752d', - './modules/Emails/EmailsController.php' => '9a70756105e5fba7221fd7d77f02ae45', + './modules/Emails/EmailsController.php' => 'cf32407c5f02fd4bf4ad2ab25f82762f', './modules/Emails/EmailsControllerActionGetFromFields.php' => 'b9d8167b00bff53cf76503c5023207f7', './modules/Emails/EmailsDataAddress.php' => 'ba1274fe0f3bc27f4cb6d397adf42de7', './modules/Emails/EmailsDataAddressCollector.php' => '35e502fadb385a66d71bc44ddd62a259', @@ -4599,10 +4599,10 @@ $md5_string = array ( './modules/Emails/controller.php' => '65d6d5ad5e977930403a2b89cb15004a', './modules/Emails/field_arrays.php' => 'f8ad985446f13141ea7365aa8565c500', './modules/Emails/include/ComposeView/ComposeView.php' => '45b1a69671ca5c5f2a8ab1455e9f730c', - './modules/Emails/include/ComposeView/ComposeView.tpl' => '02a1b64bfde0a319fcac90b1b9ebda13', + './modules/Emails/include/ComposeView/ComposeView.tpl' => 'c84113fe9c29883d6722824c32111a71', './modules/Emails/include/ComposeView/ComposeViewBlank.tpl' => '22365ce6727ffb560e5ad3fc187f13f2', './modules/Emails/include/ComposeView/ComposeViewToolbar.tpl' => '656b26827857375278124e4610b9ff06', - './modules/Emails/include/ComposeView/EmailsComposeView.js' => '0d361ec6c5e31920da6b2078bf2d0506', + './modules/Emails/include/ComposeView/EmailsComposeView.js' => 'dc5498dcf99deaf9ba40f43730389782', './modules/Emails/include/DetailView/EmailsDetailView.php' => 'f95937f398f37afe3927ecc035b8b743', './modules/Emails/include/DetailView/EmailsDraftDetailView.php' => 'baafca815e89a4c0ec3df8b6192552ea', './modules/Emails/include/DetailView/EmailsNonImportedDetailView.php' => 'ef9ecbcf65fa6f03e32f94b6a9805b2f', @@ -5501,7 +5501,7 @@ $md5_string = array ( './modules/ProspectLists/Popup_picker.html' => '242e9467d08481a15f24f9dc62663a94', './modules/ProspectLists/ProspectList.php' => '4b34527c253a2637e2f6b4ff72990bb8', './modules/ProspectLists/ProspectListFormBase.php' => '36adb8d278a608299c2d6ff183af7fd2', - './modules/ProspectLists/Save.php' => '9b3bad7aff47a312451e34a44f63fee8', + './modules/ProspectLists/Save.php' => '80045359c8b035593ab8197bbc7f985c', './modules/ProspectLists/SubPanelView.html' => '12a8e783bd44a156e193bc1be8247cda', './modules/ProspectLists/SubPanelView.php' => 'c2f9c067fc5a8b04272ea96b2b865ddc', './modules/ProspectLists/TargetListUpdate.php' => '6352f71bf03f199ddd91f3ae64371169', @@ -5637,7 +5637,7 @@ $md5_string = array ( './modules/SchedulersJobs/language/en_us.lang.php' => '213c773d3b36dfdc0b2932d936fe091b', './modules/SchedulersJobs/metadata/subpanels/default.php' => '40952b491d66cd328be1237e7dc0750c', './modules/SchedulersJobs/vardefs.php' => 'd0606930f15664bf4b40846afead6d3d', - './modules/SecurityGroups/AssignGroups.php' => 'd27ab498ec58d4e232b7f7ec607e410c', + './modules/SecurityGroups/AssignGroups.php' => '36a0479e931f51d46c5fb8c16aaffe2f', './modules/SecurityGroups/Forms.php' => 'd41d8cd98f00b204e9800998ecf8427e', './modules/SecurityGroups/MassAssign.php' => '12fe7e2a54311bba14fba390fda8a523', './modules/SecurityGroups/Menu.php' => '17fdeb091b747acd1b2a698bc3a88bbc', @@ -5705,7 +5705,7 @@ $md5_string = array ( './modules/Studio/DropDowns/EditView.tpl' => '1daa9d2575cfd5788576f7c8f06940a5', './modules/Studio/Forms.php' => 'f1b9c09d71cbf6919f46b99b9a0286d3', './modules/Studio/JSTransaction.js' => '54c0f25b68890452424d8819eeead469', - './modules/Studio/SaveTabs.php' => '75d018757e60ea2eaf6439edae57b1ea', + './modules/Studio/SaveTabs.php' => 'c094c676c1e7b64b9f2d2f393724c280', './modules/Studio/TabGroups/EditViewTabs.php' => '0d3792d18876f5dfbf3599510dc04bb3', './modules/Studio/TabGroups/EditViewTabs.tpl' => '943135f9e634454cbcc1a7d678d054a7', './modules/Studio/TabGroups/TabGroupHelper.php' => 'c56673375908c7ceb08d28a23204b572', @@ -5730,7 +5730,7 @@ $md5_string = array ( './modules/SugarFeed/Dashlets/SugarFeedDashlet/UserPostForm.tpl' => 'ef42d6abc5fd5f672d6540224aa3730e', './modules/SugarFeed/Forms.php' => 'd41d8cd98f00b204e9800998ecf8427e', './modules/SugarFeed/Menu.php' => '22842b6d2806ee33c75378a3ce284121', - './modules/SugarFeed/SugarFeed.php' => 'c2587f755157c000474ed565a0253e42', + './modules/SugarFeed/SugarFeed.php' => 'ae0dfdefaa62cf798f9e1603fc9cdf46', './modules/SugarFeed/SugarFeedFlush.php' => 'c5861f849a67f9129ddd03006f336ea3', './modules/SugarFeed/action_view_map.php' => 'ef827ccc71707c55e2f4aeee52a3ea38', './modules/SugarFeed/feedLogicBase.php' => 'bfb4cbeba25d3e81b7acfc1316aef90b', @@ -5820,7 +5820,7 @@ $md5_string = array ( './modules/SurveyResponses/metadata/studio.php' => 'd1a4aee4586f29bc1d22f2719b156bd1', './modules/SurveyResponses/metadata/subpanels/default.php' => 'fcece223dc6df7455f9d979e50d17ef1', './modules/SurveyResponses/tpls/detailquestionresponses.tpl' => 'e721176cde9db9ee091ae29b11e68ac8', - './modules/SurveyResponses/vardefs.php' => '0282afec38f3202a4227f3596e3e9b2c', + './modules/SurveyResponses/vardefs.php' => '19965a10a71f556459d978ed5a52990c', './modules/Surveys/Dashlets/SurveysDashlet/SurveysDashlet.meta.php' => '8a0be697554c54281b29bd9bc8facfd8', './modules/Surveys/Dashlets/SurveysDashlet/SurveysDashlet.php' => '533474ccb58910c160091f6898494202', './modules/Surveys/Entry/Survey.php' => '61d81ae614ff0e25a75763a52ef1eeb6', @@ -6020,7 +6020,7 @@ $md5_string = array ( './modules/Users/authentication/SugarAuthenticate/FactorAuthEmailCode.tpl' => '7d47d05738a22f219f9a96ee5393792c', './modules/Users/authentication/SugarAuthenticate/FactorAuthFactory.php' => '02b5b7c4588faf6268b79741850379c4', './modules/Users/authentication/SugarAuthenticate/FactorAuthInterface.php' => '01bb1e373dcf4cc53dc3ff41f0040d00', - './modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php' => 'b4b7219975758e1c1ef4d10725e5c495', + './modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php' => '7844f2aa29e40d890a7ecd80605e060b', './modules/Users/authentication/SugarAuthenticate/SugarAuthenticateUser.php' => 'c59bb9e71e48bed5bb9322ec9416e7b9', './modules/Users/controller.php' => '65021ed13247766dc3353cdbf8e8dada', './modules/Users/entryPointSaveGoogleApiKey.php' => 'af2395a659fbe4c935ac555e4f3b592b', @@ -6282,7 +6282,7 @@ $md5_string = array ( './soap.php' => 'e28988c2e0b8e2c484587b537a710525', './sugar_version.json' => 'bdfbcefae2f9af559bef6a36367df7bb', './sugar_version.php' => 'db7b6c8d51f87879fce1e6172eedfbed', - './suitecrm_version.php' => 'beb884cdb57683e106eea9e8ddca6168', + './suitecrm_version.php' => 'a71d2dafd3a531a389f6e03631f9ab24', './themes/SuiteP/css/Dawn/color-palette.scss' => 'e64677d79e1d68c069bdc2dc661c4f99', './themes/SuiteP/css/Dawn/icons.scss' => 'd59f8c5855e7a8df09542a663835a196', './themes/SuiteP/css/Dawn/select.ico' => '22393ad23f16c3f1462455bae8f20279', diff --git a/suitecrm_version.php b/suitecrm_version.php index 36db421e46d..ad13f9b14be 100755 --- a/suitecrm_version.php +++ b/suitecrm_version.php @@ -3,5 +3,5 @@ die('Not A Valid Entry Point'); } -$suitecrm_version = '7.12.10'; -$suitecrm_timestamp = '2023-03-02 12:00:00'; +$suitecrm_version = '7.12.11'; +$suitecrm_timestamp = '2023-04-24 12:00:00'; From 8c61ca48c2d19e23dbfc41f5f91e052a0d716840 Mon Sep 17 00:00:00 2001 From: Jack Anderson Date: Fri, 21 Apr 2023 11:06:32 +0100 Subject: [PATCH 53/53] Fix #10029 - Dashlet not changing on save --- include/MySugar/javascript/MySugar.js | 2 +- jssource/src_files/include/MySugar/javascript/MySugar.js | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/MySugar/javascript/MySugar.js b/include/MySugar/javascript/MySugar.js index 9a5fc85fc31..d7f9d655ef4 100755 --- a/include/MySugar/javascript/MySugar.js +++ b/include/MySugar/javascript/MySugar.js @@ -51,7 +51,7 @@ ajaxStatus.showStatus(SUGAR.language.get('app_strings','LBL_LOADING'));if(!url){ else if(url=='predefined_chart'){url='index.php?action=DynamicAction&DynamicAction=displayDashlet&session_commit=1&module='+module+'&to_pdf=1&id='+id;scriptUrl='index.php?action=DynamicAction&DynamicAction=getPredefinedChartScript&session_commit=1&module='+module+'&to_pdf=1&id='+id;is_chart_dashlet=true;} if(dynamic){url+='&dynamic=true';} SUGAR.mySugar.currentDashlet=document.getElementById('dashlet_entire_'+id);$.ajax({"method":"GET","url":url}).done(function(data,textStatus,jqXHR){var updateDashlet=null;if($(data).find('#dashlet_entire_'+id).length==0){updateDashlet=$(data).find('.bd-center').html();}else{updateDashlet=$(data).find('#dashlet_entire_'+id+' .bd-center').html();} -$('#dashlet_entire_'+id).find('.bd-center').html(updateDashlet);ajaxStatus.hideStatus();});return false;},setChooser:function(){var displayColumnsDef=[];var hideTabsDef=[];var left_td=document.getElementById('display_tabs_td');var right_td=document.getElementById('hide_tabs_td');var displayTabs=left_td.getElementsByTagName('select')[0];var hideTabs=right_td.getElementsByTagName('select')[0];for(i=0;i