Skip to content

Commit

Permalink
Merge branch 'release/4.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
MintHCM-admin committed May 10, 2024
2 parents 5266da7 + e805d4f commit c7ba6ff
Show file tree
Hide file tree
Showing 277 changed files with 7,051 additions and 15,039 deletions.
53 changes: 53 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
.vscode/settings.json
.htaccess
legacy/.htaccess
legacy/cache/**/*
legacy/custom/modules/*/logic_hooks.php
legacy/custom/modules/*/Ext/Vardefs/vardefs.ext.php
legacy/minthcm.log
api/configs/mint/config_override.php
index.html
install.log
legacy/.htaccess
legacy/config.php
legacy/config_override.php
legacy/config_si.php
legacy/custom/Extension/modules/Meetings/Ext/Vardefs/_override_sugarfield_jjwg_maps_address_c.php
legacy/custom/Extension/modules/Meetings/Ext/Vardefs/_override_sugarfield_jjwg_maps_geocode_status_c.php
legacy/custom/Extension/modules/Meetings/Ext/Vardefs/_override_sugarfield_jjwg_maps_lat_c.php
legacy/custom/Extension/modules/Meetings/Ext/Vardefs/_override_sugarfield_jjwg_maps_lng_c.php
legacy/custom/Extension/modules/Project/Ext/Vardefs/_override_sugarfield_jjwg_maps_address_c.php
legacy/custom/Extension/modules/Project/Ext/Vardefs/_override_sugarfield_jjwg_maps_geocode_status_c.php
legacy/custom/Extension/modules/Project/Ext/Vardefs/_override_sugarfield_jjwg_maps_lat_c.php
legacy/custom/Extension/modules/Project/Ext/Vardefs/_override_sugarfield_jjwg_maps_lng_c.php
legacy/custom/application/Ext/LogicHooks/logichooks.ext.php
legacy/custom/include/tabConfig.php
legacy/custom/modules/Home/dashlets.php
legacy/custom/modules/logic_hooks.php
legacy/include/ViewTools/Expressions/cache.php
legacy/include/ViewTools/Expressions/rebuild.lock
legacy/install.log
legacy/install/status.json
legacy/search_index.log
legacy/suitecrm.log

api/app/Config/AppConfig.php
install/assets/status.json
legacy/cache/include/javascript/sugar_field_grp.js
legacy/cache/include/javascript/sugar_grp1.js
legacy/cache/include/javascript/sugar_grp1_jquery.js
legacy/cache/include/javascript/sugar_grp1_yui.js
legacy/cache/include/javascript/sugar_grp_emails.js
legacy/cache/include/javascript/sugar_grp_jsolait.js
legacy/cache/include/javascript/sugar_grp_project.js
legacy/cache/include/javascript/sugar_grp_project_template.js
legacy/cache/include/javascript/sugar_grp_quickcomp.js
legacy/cache/include/javascript/sugar_grp_yui2.js
legacy/cache/include/javascript/sugar_grp_yui_widgets.js
legacy/custom/modules/Positions/logic_hooks.php
legacy/include/ViewTools/Expressions/VTExpression_getUploadMaxsize.php
legacy/include/ViewTools/Expressions/documentation.html
legacy/include/ViewTools/javascript/viewTools.cache.js

legacy/include/ViewTools/javascript/viewTools.cache.js
legacy/include/ViewTools/Expressions/documentation.html
20 changes: 10 additions & 10 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,34 @@ Our MintHCM community is built on the principles of inclusivity, mutual respect,

To ensure a welcoming and productive environment for all members, we ask that you adhere to the following MintHCM Community Code of Conduct:

## Be Respectful:
## Be Respectful
Treat all community members with kindness and professionalism. We embrace diversity and expect everyone to show respect for individuals of all backgrounds and identities. Harassment, discrimination, and any form of disrespectful behavior will not be tolerated.

## Maintain Professionalism:
## Maintain Professionalism
Refrain from using language or images that are sexualized or inappropriate. Avoid making unwelcome advances or engaging in behavior that could be interpreted as such. Personal attacks, trolling, and political discussions have no place in our community.

## Respect Privacy:
## Respect Privacy
Protect the privacy of others by refraining from sharing personal information without explicit consent. This includes physical addresses, email addresses, and any other private data.

## Remain Objective:
## Remain Objective
Focus on technical discussions and problem-solving. Emotions are natural, but negative emotions should not drive interactions. Assume good intentions from others and strive to find constructive solutions to technical challenges.

## Act Responsibly:
## Act Responsibly
Consider the impact of your actions on the community and the project as a whole. Be transparent about any affiliations and ensure that your contributions benefit the collective effort. Adhere to security best practices and report any vulnerabilities responsibly.

## Support Learning:
## Support Learning
Welcome users of all skill levels and be patient with those who are new to MintHCM. Encourage learning and provide assistance to those who seek it. Utilize documentation and search for solutions before asking for help.

## Combat Spam:
## Combat Spam
Maintain the integrity of our community by refraining from unsolicited advertising or spamming. Contributions should add value to the discussion and refrain from promotional content without substance.

## Contribute Back:
## Contribute Back
Embrace the spirit of open source by actively participating in the community. Offer assistance, contribute code, provide support, document features, test software, translate content, or promote MintHCM in your own way.

## Be Patient and Grateful:
## Be Patient and Grateful
Recognize that community contributions are voluntary and may take time. Exercise patience and gratitude towards those who generously give their time and expertise to the project.

## Report Violations:
## Report Violations
If you witness behavior that violates this Code of Conduct, please report it to the community moderators at contact@minthcm.org. All reports will be handled confidentially and investigated promptly.

We reserve the right to remove any content or suspend individuals who violate these guidelines. This Code of Conduct applies to all community interactions, whether within project spaces or in public forums where you represent MintHCM.
8 changes: 7 additions & 1 deletion api/app/Config/AppConfig.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,12 @@ class AppConfig

public static function getBasePath()
{
return '/new_mint/api';
//TODO Check if instance path is in config -> after rebuild config manager
$appBasePath = "/api";
$currentDirectoryName = dirname($_SERVER['PHP_SELF']);
if (str_contains($currentDirectoryName, '/api') && $appBasePath != $currentDirectoryName) {
$appBasePath = $currentDirectoryName;
}
return $appBasePath;
}
}
4 changes: 4 additions & 0 deletions api/constants/legacy_views.php
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,10 @@
'list' => false,
'record' => true,
],
'Calls' => [
'list' => false,
'record' => true,
],
'Currencies' => [
'list' => true,
'record' => true,
Expand Down
1 change: 1 addition & 0 deletions api/constants/menu_icons.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"create" => 'plus',
"view" => 'view-list',
"list" => 'view-list',
"kanban" => 'view-column',
"import" => 'import',
"default" => 'menu-open',
);
25 changes: 16 additions & 9 deletions api/lib/Search/ElasticSearch/ElasticQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ class ElasticQuery extends SearchQuery
const ALL_FIELDS = "*";

protected $exclude_modules = [];
protected $search_modules = [];

protected $add_acl_filters = false;
protected $indice_module_map;
Expand Down Expand Up @@ -99,21 +100,25 @@ protected function setSort()
);
}


private function getIndex()
{
if (isset($GLOBALS['sugar_config']['unique_key'])) {

$searchModules = array_map('strtolower', $this->search_modules);
if(isset($this->params['search']) && $this->params['search'] == 'list' && !empty($this->params['type'])){
$search_modules = [$this->params['type']];
}else{
$search_modules = $this->getGlobalSearchModuleList();
}
$searchModules = array_map('strtolower', $search_modules);
$searchModules = substr_replace($searchModules, $GLOBALS['sugar_config']['unique_key'].'_', 0, 0);
$indexes = implode(',', $searchModules);
$this->indice_module_map = array_combine($searchModules,$this->search_modules);
$this->indice_module_map = array_combine($searchModules,$search_modules);

return $indexes;
}
return null;
}


private function getBody()
{
return array(
Expand All @@ -128,8 +133,7 @@ private function getBodyQuery()
{
switch (strtolower($this->params['search'])) {
case "global":
$this->search_modules = $search_modules = $this->getGlobalSearchModuleList();
return $this->getGlobalQuery($search_modules);
return $this->getGlobalQuery();
break;
case "list":
return $this->getListQuery();
Expand All @@ -139,14 +143,14 @@ private function getBodyQuery()
}
}

private function getGlobalQuery($search_modules)
private function getGlobalQuery()
{

if($this->add_acl_filters){
$uniq = $GLOBALS['sugar_config']['unique_key'];
$main_acl["bool"]["must"] = $this->noAclGlobalQuery();
$main_acl["bool"]["filter"]["bool"]["should"] = [];

$search_modules = $this->getGlobalSearchModuleList();

foreach($search_modules as $module_to_search)
{
Expand Down Expand Up @@ -240,6 +244,9 @@ public function getIndiceToModuleMapping(){
}

protected function getGlobalSearchModuleList(){
if(!empty($this->search_modules)){
return $this->search_modules;
}
include '../legacy/custom/modules/unified_search_modules_display.php';

$search_modules = [];
Expand All @@ -256,7 +263,7 @@ protected function getGlobalSearchModuleList(){
$this->exclude_modules = array_merge($exclude_hardcode,array_keys($exclude));
return array_diff(array_keys($search_modules),$this->exclude_modules);
}

$this->search_modules = $search_modules;
return $search_modules;
}
}
1 change: 0 additions & 1 deletion assets/InstallView.5bad4125.js

This file was deleted.

1 change: 1 addition & 0 deletions assets/InstallView.c3b08d94.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/InstallView.dae7be72.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c7ba6ff

Please sign in to comment.