diff --git a/wire/core/PagesLoader.php b/wire/core/PagesLoader.php index 61d099c4..40b76e4c 100644 --- a/wire/core/PagesLoader.php +++ b/wire/core/PagesLoader.php @@ -1352,7 +1352,7 @@ class PagesLoader extends Wire { } } catch(\Exception $e) { $error = $e->getMessage() . " [pageClass=$class, template=$template]"; - $user = $this->wire('user'); + $user = $this->wire()->user; if($user && $user->isSuperuser()) $this->error($error); $this->wire()->log->error($error); $this->trackException($e, false); diff --git a/wire/core/PagesLoaderCache.php b/wire/core/PagesLoaderCache.php index bdf1cd63..0cc6b526 100644 --- a/wire/core/PagesLoaderCache.php +++ b/wire/core/PagesLoaderCache.php @@ -84,9 +84,10 @@ class PagesLoaderCache extends Wire { if(!ctype_digit("$id")) $id = str_replace('id=', '', $id); if(ctype_digit("$id")) $id = (int) $id; if(!isset($this->pageIdCache[$id])) return null; - /** @var Page $page */ - $page = $this->pageIdCache[$id]; - $page->setOutputFormatting($this->pages->outputFormatting); + $page = $this->pageIdCache[$id]; /** @var Page $page */ + $of = $this->pages->loader()->getOutputFormatting(); + if(!$of && $page === $this->wire()->page) return $page; // skip of() adjustment + $page->of($of); return $page; } diff --git a/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss b/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss index c23d8182..9e195ba9 100644 --- a/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss +++ b/wire/modules/AdminTheme/AdminThemeReno/styles/_common.scss @@ -666,7 +666,7 @@ ul.action-group{ /* AdminDataTableSortable */ - .AdminDataTableSortable th { + .AdminDataTableSortable th:not(.sorter-false) { &:after { content: "\f0dc"; font-family: fontAwesome; @@ -689,7 +689,7 @@ ul.action-group{ content: none; // newer version of tablesorter has different markup. } - tr.tablesorter-headerRow th { + tr.tablesorter-headerRow th:not(.sorter-false) { & .tablesorter-header-inner:after{ content: " "; @@ -1305,4 +1305,4 @@ body.pw-init .toggle-icon { padding-right: 0.9em; } -} \ No newline at end of file +} diff --git a/wire/modules/Markup/MarkupAdminDataTable/MarkupAdminDataTable.css b/wire/modules/Markup/MarkupAdminDataTable/MarkupAdminDataTable.css index 05d12681..4a704e38 100644 --- a/wire/modules/Markup/MarkupAdminDataTable/MarkupAdminDataTable.css +++ b/wire/modules/Markup/MarkupAdminDataTable/MarkupAdminDataTable.css @@ -60,6 +60,12 @@ table.AdminDataList td .sort-date { display: none; } +/* +table.AdminDataTableSortable thead tr.tablesorter-headerRow th.sorter-false .tablesorter-header-inner { + display: none !important; +} +*/ + /* table.AdminDataTableResizable, table.AdminDataTableResizable *, @@ -161,5 +167,3 @@ table.AdminDataTableResizable *:after { } } - - diff --git a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module index 9291d5f2..b2f0c8d7 100644 --- a/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module +++ b/wire/modules/Process/ProcessPageEdit/ProcessPageEdit.module @@ -1482,7 +1482,7 @@ class ProcessPageEdit extends Process implements WirePageEditor, ConfigurableMod if($userTemplate && $userTemplate->pageLabelField) { $f->labelFieldFormat = $userTemplate->pageLabelField; } else { - $f->labelFieldFormat = '{name} ({email}) [roles.name]'; + $f->labelFieldFormat = '{name} ({email}) [{roles.name}]'; } $f->searchFields = implode(' ', $searchFields); $f->maxSelectedItems = 1;