lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19544 from FHenry/dev_error_return_hrm

Browse Source 
fix: HRM new module skills
This commit is contained in:
Laurent Destailleur 2021-12-08 16:17:45 +01:00 committed by GitHub
commit 3baa9688b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/hrm/class/skill.class.php
View File

@ -410,7 +410,13 @@ class Skill extends CommonObject
$skilldet = new Skilldet($this->db); $skilldet = new Skilldet($this->db);
$this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), ''); $this->lines = $skilldet->fetchAll('ASC', '', '', '', array('fk_skill' => $this->id), '');
if (is_array($this->lines)) {
return (count($this->lines) > 0) ? $this->lines : array(); return (count($this->lines) > 0) ? $this->lines : array();
} elseif ($this->lines < 0) {
$this->errors = array_merge($this->errors, $skilldet->errors);
$this->error = $skilldet->error;
return $this->lines;
}
} }

8
htdocs/hrm/lib/hrm_skillrank.lib.php
View File

@ -113,12 +113,15 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
// On charge les différentes notes possibles pour la compétence $fk_skill // On charge les différentes notes possibles pour la compétence $fk_skill
$skilldet = new Skilldet($db); $skilldet = new Skilldet($db);
$Lines = $skilldet->fetchAll('ASC', 'rank', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill)); $Lines = $skilldet->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$fk_skill));
if (!is_array($Lines) && $Lines<0) {
setEventMessages($skilldet->error, $skilldet->errors, 'errors');
}
if (empty($Lines)) return $langs->trans('SkillHasNoLines'); if (empty($Lines)) return $langs->trans('SkillHasNoLines');
$ret = '<!-- field jquery --><span title="'.$langs->trans('NA').'" class="radio_js_bloc_number '.$inputname.'_'.$fk_skill.(empty($selected_rank) ? ' selected' : '').'">0</span>'; $ret = '<!-- field jquery --><span title="'.$langs->trans('NA').'" class="radio_js_bloc_number '.$inputname.'_'.$fk_skill.(empty($selected_rank) ? ' selected' : '').'">0</span>';
if (is_array($Lines) && !empty($Lines)) {
foreach ($Lines as $line) { foreach ($Lines as $line) {
$MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL; $MaxNumberSkill = isset($conf->global->HRM_MAXRANK) ? $conf->global->HRM_MAXRANK : Skill::DEFAULT_MAX_RANK_PER_SKILL;
if ($line->rank > $MaxNumberSkill) { if ($line->rank > $MaxNumberSkill) {
@ -154,6 +157,7 @@ function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode
}); });
</script>'; </script>';
} }
}
return $ret; return $ret;
} }