Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
057e107d
Commit
057e107d
authored
8 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix on skeleton
parent
dcb18cd6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
dev/skeletons/skeleton_card.php
+2
-2
2 additions, 2 deletions
dev/skeletons/skeleton_card.php
dev/skeletons/skeleton_class.class.php
+7
-6
7 additions, 6 deletions
dev/skeletons/skeleton_class.class.php
with
9 additions
and
8 deletions
dev/skeletons/skeleton_card.php
+
2
−
2
View file @
057e107d
...
...
@@ -59,7 +59,7 @@ $myparam = GETPOST('myparam','alpha');
$search_field1
=
GETPOST
(
"search_field1"
);
$search_field2
=
GETPOST
(
"search_field2"
);
if
(
empty
(
$action
)
&&
empty
(
$id
)
&&
empty
(
$ref
))
$action
=
'
list
'
;
if
(
empty
(
$action
)
&&
empty
(
$id
)
&&
empty
(
$ref
))
$action
=
'
view
'
;
// Protection if external user
if
(
$user
->
societe_id
>
0
)
...
...
@@ -300,7 +300,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
}
print
'<table class="border centpercent">'
.
"
\n
"
;
// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>
<input class="flat" type="text" size="36" name="label" value="'.$
label.'
">
</td></tr>';
// print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td>
'.$object->
label.'</td></tr>';
// LIST_OF_TD_LABEL_FIELDS_VIEW
print
'</table>'
;
...
...
This diff is collapsed.
Click to expand it.
dev/skeletons/skeleton_class.class.php
+
7
−
6
View file @
057e107d
...
...
@@ -365,6 +365,8 @@ class Skeleton_Class extends CommonObject
}
}
// If you need to delete child tables to, you can insert them here
if
(
!
$error
)
{
$sql
=
'DELETE FROM '
.
MAIN_DB_PREFIX
.
$this
->
table_element
;
$sql
.
=
' WHERE rowid='
.
$this
->
id
;
...
...
@@ -437,8 +439,7 @@ class Skeleton_Class extends CommonObject
}
/**
* Return a link to the user card (with optionaly the picto)
* Use this->id,this->lastname, this->firstname
* Return a link to the object card (with optionaly the picto)
*
* @param int $withpicto Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
* @param string $option On what the link point to
...
...
@@ -461,7 +462,7 @@ class Skeleton_Class extends CommonObject
$label
.
=
'<div width="100%">'
;
$label
.
=
'<b>'
.
$langs
->
trans
(
'Ref'
)
.
':</b> '
.
$this
->
ref
;
$link
=
'<a href="'
.
DOL_URL_ROOT
.
'/mymodule/card.php?id='
.
$this
->
id
.
'"'
;
$link
=
'<a href="'
.
DOL_URL_ROOT
.
'/mymodule/
'
.
$this
->
table_name
.
'_
card.php?id='
.
$this
->
id
.
'"'
;
$link
.
=
(
$notooltip
?
''
:
' title="'
.
dol_escape_htmltag
(
$label
,
1
)
.
'" class="classfortooltip'
.
(
$morecss
?
' '
.
$morecss
:
''
)
.
'"'
);
$link
.
=
'>'
;
$linkend
=
'</a>'
;
...
...
@@ -487,13 +488,13 @@ class Skeleton_Class extends CommonObject
}
/**
* Re
nvoi le libelle d'un status donne
* Re
turn the status
*
* @param int $status Id status
* @param int $mode 0=l
ibelle long, 1=libelle court
, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @param int $mode 0=l
ong label, 1=short label
, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
* @return string Label of status
*/
function
LibStatut
(
$status
,
$mode
=
0
)
static
function
LibStatut
(
$status
,
$mode
=
0
)
{
global
$langs
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment