FIX : stickler feedbacks part 4
This commit is contained in:
parent
acbf09ba59
commit
030829942c
@ -95,12 +95,6 @@ function skillPrepareHead($object)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//Affichage des 5 trades pour cet object
|
|
||||||
function showTraductionNote($object)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show html area for list of traduction
|
* Show html area for list of traduction
|
||||||
*
|
*
|
||||||
|
|||||||
@ -94,6 +94,16 @@ function skillrankPrepareHead($object)
|
|||||||
return $head;
|
return $head;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Used to print ranks of a skill into several case, view or edit pour js necessary to select a rank
|
||||||
|
*
|
||||||
|
* @param int $selected_rank rank we want to preselect
|
||||||
|
* @param int $fk_skill id of skill we display ranks
|
||||||
|
* @param string $inputname html name of input
|
||||||
|
* @param string $mode view or edit
|
||||||
|
*
|
||||||
|
* @return string string result
|
||||||
|
*/
|
||||||
function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode = 'view')
|
function displayRankInfos($selected_rank, $fk_skill, $inputname = 'TNote', $mode = 'view')
|
||||||
{
|
{
|
||||||
global $db, $conf, $langs;
|
global $db, $conf, $langs;
|
||||||
|
|||||||
@ -188,17 +188,16 @@ llxHeader('', $title, $help_url);
|
|||||||
|
|
||||||
if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
|
if ($job->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
|
||||||
DisplayJob($job);
|
DisplayJob($job);
|
||||||
DisplayPositionList($conf, $langs, $db);
|
DisplayPositionList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the top of the page including informations of a job
|
* Show the top of the page including informations of a job
|
||||||
*
|
*
|
||||||
* @param DoliDB $db Database handler
|
|
||||||
* @param Job $object Job object
|
* @param Job $object Job object
|
||||||
* @param $permissiontoadd $permissiontoadd Rights/permissions
|
*
|
||||||
* @return array
|
* @return void
|
||||||
*/
|
*/
|
||||||
function DisplayJob($object)
|
function DisplayJob($object)
|
||||||
{
|
{
|
||||||
@ -266,14 +265,10 @@ function DisplayJob($object)
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Show a list of positions for the current job
|
* Show a list of positions for the current job
|
||||||
|
*
|
||||||
* @param Conf $conf Object conf
|
* @return void
|
||||||
* @param Translate $langs Object langs
|
|
||||||
* @param DoliDB $db Database handler
|
|
||||||
* @param Position $object Position object
|
|
||||||
* @return array|void
|
|
||||||
*/
|
*/
|
||||||
function DisplayPositionList($conf, $langs, $db)
|
function DisplayPositionList()
|
||||||
{
|
{
|
||||||
global $user, $langs, $db, $conf, $extrafields, $hookmanager, $permissiontoadd, $permissiontodelete;
|
global $user, $langs, $db, $conf, $extrafields, $hookmanager, $permissiontoadd, $permissiontodelete;
|
||||||
|
|
||||||
@ -897,7 +892,7 @@ function DisplayPositionList($conf, $langs, $db)
|
|||||||
|
|
||||||
print $formfile->showdocuments('massfilesarea_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
|
print $formfile->showdocuments('massfilesarea_hrm', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
|
||||||
}
|
}
|
||||||
return array($arrayfields, $object, $action, $obj, $totalarray);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Part to create
|
// Part to create
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user