mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 08:17:12 +02:00
Code Issues Releases Wiki Activity

Minor unrelated adjustments

Browse Source
This commit is contained in:
Ryan Cramer
2023-08-01 11:19:29 -04:00
parent 1271fa684a
commit 223c0e79be
5 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wire/core/PagesLoader.php
View File

@@ -1352,7 +1352,7 @@ class PagesLoader extends Wire {
} }
} catch(\Exception $e) { } catch(\Exception $e) {
$error = $e->getMessage() . " [pageClass=$class, template=$template]"; $error = $e->getMessage() . " [pageClass=$class, template=$template]";
$user = $this->wire('user'); $user = $this->wire()->user;
if($user && $user->isSuperuser()) $this->error($error); if($user && $user->isSuperuser()) $this->error($error);
$this->wire()->log->error($error); $this->wire()->log->error($error);
$this->trackException($e, false); $this->trackException($e, false);

7
wire/core/PagesLoaderCache.php
View File

@@ -84,9 +84,10 @@ class PagesLoaderCache extends Wire {
if(!ctype_digit("$id")) $id = str_replace('id=', '', $id); if(!ctype_digit("$id")) $id = str_replace('id=', '', $id);
if(ctype_digit("$id")) $id = (int) $id; if(ctype_digit("$id")) $id = (int) $id;
if(!isset($this->pageIdCache[$id])) return null; if(!isset($this->pageIdCache[$id])) return null;
/** @var Page $page */ $page = $this->pageIdCache[$id]; /** @var Page $page */
$page = $this->pageIdCache[$id]; $of = $this->pages->loader()->getOutputFormatting();
$page->setOutputFormatting($this->pages->outputFormatting); if(!$of && $page === $this->wire()->page) return $page; // skip of() adjustment
$page->of($of);
return $page; return $page;
} }

6
wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss
View File

@@ -666,7 +666,7 @@ ul.action-group{
/* AdminDataTableSortable */ /* AdminDataTableSortable */
.AdminDataTableSortable th { .AdminDataTableSortable th:not(.sorter-false) {
&:after { &:after {
content: "\f0dc"; content: "\f0dc";
font-family: fontAwesome; font-family: fontAwesome;
@@ -689,7 +689,7 @@ ul.action-group{
content: none; // newer version of tablesorter has different markup. content: none; // newer version of tablesorter has different markup.
} }
tr.tablesorter-headerRow th { tr.tablesorter-headerRow th:not(.sorter-false) {
& .tablesorter-header-inner:after{ & .tablesorter-header-inner:after{
content: " "; content: " ";
@@ -1305,4 +1305,4 @@ body.pw-init .toggle-icon {
padding-right: 0.9em; padding-right: 0.9em;
} }
} }

8
wire/modules/Markup/MarkupAdminDataTable/MarkupAdminDataTable.css
View File

@@ -60,6 +60,12 @@ table.AdminDataList td .sort-date {
display: none; display: none;
} }
/*
table.AdminDataTableSortable thead tr.tablesorter-headerRow th.sorter-false .tablesorter-header-inner {
display: none !important;
}
*/
/* /*
table.AdminDataTableResizable, table.AdminDataTableResizable,
table.AdminDataTableResizable *, table.AdminDataTableResizable *,
@@ -161,5 +167,3 @@ table.AdminDataTableResizable *:after {
} }
} }

2
wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module
View File

@@ -1482,7 +1482,7 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod
if($userTemplate && $userTemplate->pageLabelField) { if($userTemplate && $userTemplate->pageLabelField) {
$f->labelFieldFormat = $userTemplate->pageLabelField; $f->labelFieldFormat = $userTemplate->pageLabelField;
} else { } else {
$f->labelFieldFormat = '{name} ({email}) [roles.name]'; $f->labelFieldFormat = '{name} ({email}) [{roles.name}]';
} }
$f->searchFields = implode(' ', $searchFields); $f->searchFields = implode(' ', $searchFields);
$f->maxSelectedItems = 1; $f->maxSelectedItems = 1;