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

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2018-10-30 15:32:25 +01:00
commit a3e49f021d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/actions_addupdatedelete.inc.php
View File

@ -72,7 +72,7 @@ if ($action == 'add' && ! empty($permissiontoadd))
if (! $error) if (! $error)
{ {
$result=$object->createCommon($user); $result=$object->create($user);
if ($result > 0) if ($result > 0)
{ {
// Creation OK // Creation OK
@ -127,7 +127,7 @@ if ($action == 'update' && ! empty($permissiontoadd))
if (! $error) if (! $error)
{ {
$result=$object->updateCommon($user); $result=$object->update($user);
if ($result > 0) if ($result > 0)
{ {
$action='view'; $action='view';
@ -169,7 +169,7 @@ if ($action == "update_extras" && ! empty($permissiontoadd))
// Action to delete // Action to delete
if ($action == 'confirm_delete' && ! empty($permissiontodelete)) if ($action == 'confirm_delete' && ! empty($permissiontodelete))
{ {
$result=$object->deleteCommon($user); $result=$object->delete($user);
if ($result > 0) if ($result > 0)
{ {
// Delete OK // Delete OK

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

@ -3237,6 +3237,9 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
elseif ($pictowithoutext == 'playdisabled') { elseif ($pictowithoutext == 'playdisabled') {
$fakey = 'fa-play'; $fakey = 'fa-play';
$facolor = '#ccc'; $facolor = '#ccc';
} elseif ($pictowithoutext == 'play') {
$fakey = 'fa-play';
$facolor = '#444';
} }
else { else {
$fakey = 'fa-'.$pictowithoutext; $fakey = 'fa-'.$pictowithoutext;