SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-09-02 08:09:19 +08:00
Code Issues Projects Packages Activity Actions

[Legacy] Fix UI install

Browse source 
- fix ui install when demo data is enabled
This commit is contained in:
Clemente Raposo 2023-12-11 13:00:23 +00:00
parent e5ef8ec740
commit 5b86d15ed7
2 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
public/legacy/install/performSetup.php
View file

@ -727,7 +727,7 @@ $configurator->saveConfig();
// Bug 37310 - Delete any existing currency that matches the one we've just set the default to during the admin wizard
installLog('new Currency');
$currency = new Currency;
$currency = new Currency();
installLog('retrieve');
$currency->retrieve($currency->retrieve_id_by_name($_REQUEST['default_currency_name']));
if (!empty($currency->id)
@ -749,10 +749,15 @@ installLog('Save user settings..');
// set all of these default parameters since the Users save action will undo the defaults otherwise
// load admin
$current_user = BeanFactory::newBean('Users');
$current_user->retrieve(1);
$current_user->is_admin = '1';
$sugar_config = get_sugar_config_defaults();
if (empty($current_user) || empty($current_user->id)) {
$current_user = BeanFactory::newBean('Users');
$current_user->retrieve(1);
$current_user->is_admin = '1';
}
if (empty($sugar_config)) {
$sugar_config = get_sugar_config_defaults();
}
// set local settings - if neccessary you can set here more fields as named in User module / EditView form...
if (isset($_REQUEST['timezone']) && $_REQUEST['timezone']) {

6
public/legacy/modules/Currencies/Currency.php
View file

@ -128,7 +128,7 @@ class Currency extends SugarBean
public function getDefaultCurrencyName()
{
global $sugar_config;
return $sugar_config['default_currency_name'];
return $sugar_config['default_currency_name'] ?? 'US Dollars';
}
/**
@ -140,7 +140,7 @@ class Currency extends SugarBean
public function getDefaultCurrencySymbol()
{
global $sugar_config;
return $sugar_config['default_currency_symbol'];
return $sugar_config['default_currency_symbol'] ?? '$';
}
/**
@ -152,7 +152,7 @@ class Currency extends SugarBean
public function getDefaultISO4217()
{
global $sugar_config;
return $sugar_config['default_currency_iso4217'];
return $sugar_config['default_currency_iso4217'] ?? 'USD';
}
/**