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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-06 15:14:41 +01:00
commit 063cb6bf83
4 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/search_page.php
View File

@ -115,7 +115,7 @@ print "\n";
print "<!-- Begin SearchForm -->\n";
print '<div class="center"><div class="center" style="padding: 6px;">';
print '<style>.menu_titre { padding-top: 7px; }</style>';
print '<div id="blockvmenusearch">'."\n";
print '<div id="blockvmenusearch" class="tagtable center searchpage">'."\n";
print $searchform;
print '</div>'."\n";
print '</div></div>';

6
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -584,8 +584,8 @@ class MyObject extends CommonObject
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->myobject->dir_output.'/'.$oldref;
$dirdest = $conf->myobject->dir_output.'/'.$newref;
$dirsource = $conf->mymodule->dir_output.'/myobject/'.$oldref;
$dirdest = $conf->mymodule->dir_output.'/myobject/'.$newref;
if (!$error && file_exists($dirsource))
{
dol_syslog(get_class($this)."::validate() rename dir ".$dirsource." into ".$dirdest);
@ -594,7 +594,7 @@ class MyObject extends CommonObject
{
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
$listoffiles = dol_dir_list($conf->myobject->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
$listoffiles = dol_dir_list($conf->mymodule->dir_output.'/myobject/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
foreach ($listoffiles as $fileentry)
{
$dirsource = $fileentry['name'];

10
htdocs/theme/eldy/global.inc.php
View File

@ -5173,9 +5173,17 @@ dd.dropdowndd ul li {
/* ============================================================================== */
/* JMobile */
/* JMobile - Android */
/* ============================================================================== */
.searchpage .tagtr .tagtd {
padding-bottom: 3px;
}
.searchpage .tagtr .tagtd .button {
background: unset;
border: unset;
}
li.ui-li-divider .ui-link {
color: #FFF !important;
}

10
htdocs/theme/md/style.css.php
View File

@ -5306,9 +5306,17 @@ dd.dropdowndd ul li {
/* ============================================================================== */
/* JMobile */
/* JMobile - Android */
/* ============================================================================== */
.searchpage .tagtr .tagtd {
padding-bottom: 3px;
}
.searchpage .tagtr .tagtd .button {
background: unset;
border: unset;
}
li.ui-li-divider .ui-link {
color: #FFF !important;
}