From 3153966b2438c1faddfcaf00e38150af2f1e24f5 Mon Sep 17 00:00:00 2001 From: lmarcouiller Date: Fri, 9 Apr 2021 09:19:52 +0200 Subject: [PATCH] New edit object in module builder --- htdocs/modulebuilder/index.php | 204 ++++++++++++++++++++++----------- 1 file changed, 137 insertions(+), 67 deletions(-) diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 682fa4bc330..8fa37b17588 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1212,6 +1212,10 @@ if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') && } } +if ($dirins && $action == 'saveeditproperty' && !empty($module) && !empty($tabobj) && empty($cancel)) { + print 'test'; +} + if ($dirins && $action == 'addproperty' && !empty($module) && !empty($tabobj)) { $error = 0; @@ -2694,75 +2698,141 @@ if ($module == 'initmodule') { print ''; print dol_escape_htmltag($proplabel); print ''; - print ''; - print ''.dol_escape_htmltag($proptype).''; - print ''; - print ''; - if ($proparrayofkeyval) { - print ''; - print dol_escape_htmltag(json_encode($proparrayofkeyval)); + if ($action == 'editproperty' && $propname == $propertykey) { + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + print ''; + } else { + print ''; + print ''.dol_escape_htmltag($proptype).''; + print ''; + print ''; + if ($proparrayofkeyval) { + print ''; + print dol_escape_htmltag(json_encode($proparrayofkeyval)); + print ''; + } + print ''; + print ''; + print dol_escape_htmltag($propnotnull); + print ''; + print ''; + print dol_escape_htmltag($propdefault); + print ''; + print ''; + print $propindex ? '1' : ''; + print ''; + print ''; + print $propforeignkey ? dol_escape_htmltag($propforeignkey) : ''; + print ''; + print ''; + print dol_escape_htmltag($propposition); + print ''; + print ''; + print $propenabled ? dol_escape_htmltag($propenabled) : ''; + print ''; + print ''; + print $propvisible ? dol_escape_htmltag($propvisible) : '0'; + print ''; + print ''; + print $propnoteditable ? dol_escape_htmltag($propnoteditable) : ''; + print ''; + print ''; + print $propsearchall ? '1' : ''; + print ''; + print ''; + print $propisameasure ? dol_escape_htmltag($propisameasure) : ''; + print ''; + print ''; + print $propcss ? dol_escape_htmltag($propcss) : ''; + print ''; + print ''; + print $propcssview ? dol_escape_htmltag($propcssview) : ''; + print ''; + print ''; + print $propcsslist ? dol_escape_htmltag($propcsslist) : ''; + print ''; + print ''; + print $prophelp ? dol_escape_htmltag($prophelp) : ''; + print ''; + print ''; + print $propshowoncombobox ? dol_escape_htmltag($propshowoncombobox) : ''; + print ''; + /*print ''; + print $propdisabled?$propdisabled:''; + print '';*/ + print ''; + print ''; + print dol_escape_htmltag($propcomment); print ''; + print ''; + print ''; + if ($propname != 'rowid') { + print ''.img_delete().''; + print ' '; + print ''.img_edit().''; + } + print ''; } - print ''; - print ''; - print dol_escape_htmltag($propnotnull); - print ''; - print ''; - print dol_escape_htmltag($propdefault); - print ''; - print ''; - print $propindex ? '1' : ''; - print ''; - print ''; - print $propforeignkey ? dol_escape_htmltag($propforeignkey) : ''; - print ''; - print ''; - print dol_escape_htmltag($propposition); - print ''; - print ''; - print $propenabled ? dol_escape_htmltag($propenabled) : ''; - print ''; - print ''; - print $propvisible ? dol_escape_htmltag($propvisible) : '0'; - print ''; - print ''; - print $propnoteditable ? dol_escape_htmltag($propnoteditable) : ''; - print ''; - print ''; - print $propsearchall ? '1' : ''; - print ''; - print ''; - print $propisameasure ? dol_escape_htmltag($propisameasure) : ''; - print ''; - print ''; - print $propcss ? dol_escape_htmltag($propcss) : ''; - print ''; - print ''; - print $propcssview ? dol_escape_htmltag($propcssview) : ''; - print ''; - print ''; - print $propcsslist ? dol_escape_htmltag($propcsslist) : ''; - print ''; - print ''; - print $prophelp ? dol_escape_htmltag($prophelp) : ''; - print ''; - print ''; - print $propshowoncombobox ? dol_escape_htmltag($propshowoncombobox) : ''; - print ''; - /*print ''; - print $propdisabled?$propdisabled:''; - print '';*/ - print ''; - print ''; - print dol_escape_htmltag($propcomment); - print ''; - print ''; - print ''; - if ($propname != 'rowid') { - print ''.img_delete().''; - } - print ''; - print ''; } } else {