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

fix travis errors

Browse Source
This commit is contained in:
John BOTELLA 2019-03-04 11:11:15 +01:00
parent 421c009e58
commit c420cab500
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
htdocs/core/lib/functions.lib.php
View File

@ -7926,10 +7926,11 @@ function roundUpToNextMultiple($n, $x = 5)
* @param string $html optional : label of badge with html * @param string $html optional : label of badge with html
* @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 * @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9
* @param string $mode default '' , pill, dot * @param string $mode default '' , pill, dot
* @param string $url the url for link
* @param array $params various params for future : recommended rather than adding more fuction arguments * @param array $params various params for future : recommended rather than adding more fuction arguments
* @return string * @return string html badge
*/ */
function dol_get_badge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params=array()) function dol_get_badge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
{ {
$attr=array( $attr=array(
@ -7982,7 +7983,9 @@ function dol_get_badge($label, $html = '', $type = 'primary', $mode = '', $url =
* @param string $html optional : label of badge with html * @param string $html optional : label of badge with html
* @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 * @param string $type type of badge : Primary Secondary Success Danger Warning Info Light Dark status0 status1 status2 status3 status4 status5 status6 status7 status8 status9
* @param string $mode default '' , pill, dot * @param string $mode default '' , pill, dot
* @param array $params various params for future : recommended rather than adding more function arguments * @param string $url the url for link
* @param array $params various params for future : recommended rather than adding more function arguments *
* @return void print html bagde
*/ */
function dol_print_badge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array()) function dol_print_badge($label, $html = '', $type = 'primary', $mode = '', $url = '', $params = array())
{ {
@ -7993,10 +7996,10 @@ function dol_print_badge($label, $html = '', $type = 'primary', $mode = '', $url
* @param string $statusLabel label of badge no html : use in alt attribute for accessibility * @param string $statusLabel label of badge no html : use in alt attribute for accessibility
* @param string $html optional : label of badge with html * @param string $html optional : label of badge with html
* @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name * @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
* @param int $displayMode for retrocompatibility 0=label only, 1=label + Picto, 2=Picto, 3=Picto + label * @param int $displayMode for retrocompatibility 0=label only, 1=label + Picto, 2=Picto, 3=Picto + label
* @param string $url * @param string $url the url for link
* @param array $params various params for future : recommended rather than adding more function arguments * @param array $params various params for future : recommended rather than adding more function arguments
* @return string * @return string html status
*/ */
function dol_get_status($statusLabel = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array()) function dol_get_status($statusLabel = '', $html = '', $statusType = 'status0', $displayMode = 0, $url = '', $params = array())
{ {
@ -8053,7 +8056,7 @@ function dol_get_status($statusLabel = '', $html = '', $statusType = 'status0',
$mode = 'pill'; $mode = 'pill';
if($displayMode == 2)$mode = 'dot'; if($displayMode == 2)$mode = 'dot';
$return = dol_get_badge($statusLabel, $html,$statusType,$mode); $return = dol_get_badge($statusLabel, $html, $statusType, $mode);
} }
return $return; return $return;
@ -8061,14 +8064,15 @@ function dol_get_status($statusLabel = '', $html = '', $statusType = 'status0',
/** /**
* @param string $statusLabel label of badge no html : use in alt attribute for accessibility * @param string $statusLabel label of badge no html : use in alt attribute for accessibility
* @param string $html optional : label of badge with html * @param string $html optional : label of badge with html
* @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name * @param string $statusType status0 status1 status2 status3 status4 status5 status6 status7 status8 status9 : image name or badge name
* @param int $displayMode for retrocompatibility 0=label only, 1=label + Picto, 2=Picto, 3=Picto + label * @param int $displayMode for retrocompatibility 0=label only, 1=label + Picto, 2=Picto, 3=Picto + label
* @param string $url * @param string $url the url for link
* @param array $params various params for future : recommended rather than adding more function arguments * @param array $params various params for future : recommended rather than adding more function arguments
* @return void print html status
*/ */
function dol_print_status($statusLabel='', $html='', $statusType='status0', $displayMode=0, $url='', $params=array()) function dol_print_status($statusLabel='', $html='', $statusType='status0', $displayMode=0, $url='', $params = array())
{ {
print dol_get_status($statusLabel, $html, $statusType, $displayMode, $url, $params); print dol_get_status($statusLabel, $html, $statusType, $displayMode, $url, $params);
} }
@ -8077,13 +8081,13 @@ function dol_print_status($statusLabel='', $html='', $statusType='status0', $dis
* @param string $label label of button no html : use in alt attribute for accessibility $html is not empty * @param string $label label of button no html : use in alt attribute for accessibility $html is not empty
* @param string $html optional : content with html * @param string $html optional : content with html
* @param string $actionType default, delete, danger * @param string $actionType default, delete, danger
* @param string $url * @param string $url the url for link
* @param string $id attribute id of button * @param string $id attribute id of button
* @param int $userRight user action right * @param int $userRight user action right
* @param array $params various params for future : recommended rather than adding more function arguments * @param array $params various params for future : recommended rather than adding more function arguments
* @return string * @return string html button
*/ */
function dol_get_buttonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params=array()) function dol_get_buttonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
{ {
@ -8145,12 +8149,13 @@ function dol_get_buttonAction($label, $html = '', $actionType = 'default', $url
* @param string $label label of button no html : use in alt attribute for accessibility $html is not empty * @param string $label label of button no html : use in alt attribute for accessibility $html is not empty
* @param string $html optional : content with html * @param string $html optional : content with html
* @param string $actionType default, delete, danger * @param string $actionType default, delete, danger
* @param string $url * @param string $url the url for link
* @param string $id attribute id of button * @param string $id attribute id of button
* @param int $userRight user action right * @param int $userRight user action right
* @param array $params various params for future : recommended rather than adding more function arguments * @param array $params various params for future : recommended rather than adding more function arguments
* @return void print html button
*/ */
function dol_print_buttonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params=array()) function dol_print_buttonAction($label, $html = '', $actionType = 'default', $url = '', $id = '', $userRight = 1, $params = array())
{ {
print dol_get_buttonAction($label, $html, $actionType, $url, $id, $userRight, $params); print dol_get_buttonAction($label, $html, $actionType, $url, $id, $userRight, $params);
} }