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

Fix issue processwire/processwire-issues#1225 plus some other small upgrades to the FieldsTableTools notices

Browse Source
This commit is contained in:
Ryan Cramer
2020-08-20 10:02:16 -04:00
parent 9e9cc31051
commit 0dda488739
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
wire/core/FieldsTableTools.php
View File

@@ -223,13 +223,11 @@ class FieldsTableTools extends Wire {
if($checking) return; if($checking) return;
$col = 'data'; $col = 'data';
$session = $this->wire('session');
if($verbose && !$session) return;
// is unique index requested? // is unique index requested?
$useUnique = (bool) $field->get('flagUnique'); $useUnique = (bool) $field->get('flagUnique');
// ise unique index already present? // is unique index already present?
$hasUnique = (bool) $field->hasFlag(Field::flagUnique); $hasUnique = (bool) $field->hasFlag(Field::flagUnique);
if($useUnique === $hasUnique) return; if($useUnique === $hasUnique) return;
@@ -243,33 +241,34 @@ class FieldsTableTools extends Wire {
$qty = $this->deleteEmptyRows($field, $col); $qty = $this->deleteEmptyRows($field, $col);
if($qty && $verbose) { if($qty && $verbose) {
$session->message(sprintf($this->_('Deleted %d empty row(s) for field %s'), $qty, $field->name)); $this->message(sprintf($this->_('Deleted %d empty row(s) for field %s'), $qty, $field->name));
} }
$result = $this->setUniqueIndex($field, true); $result = $this->setUniqueIndex($field, true);
if($result === false && $verbose) { if($result === false && $verbose) {
$pageEditUrl = $this->wire()->config->urls->admin . 'page/edit/?id=';
$msg = $this->_('Unique index cannot be added yet because there are already non-unique row(s) present:') . ' '; $msg = $this->_('Unique index cannot be added yet because there are already non-unique row(s) present:') . ' ';
$rows = $this->findDuplicateRows($field, array('verbose' => true, 'column' => $col)); $rows = $this->findDuplicateRows($field, array('verbose' => true, 'column' => $col));
foreach($rows as $row) { foreach($rows as $row) {
$ids = array(); $ids = array();
foreach($row['rows'] as $a) { foreach($row['rows'] as $a) {
$ids[] = $a['pages_id']; $ids[] = '[' . $a['pages_id'] . '](' . $pageEditUrl . $a['pages_id'] . ')';
} }
$msg .= "\n• $row[value] — " . $msg .= "[br]• $row[value] — " .
sprintf($this->_('Appears %d times'), $row['count']) . ' ' . sprintf($this->_('Appears %d times'), $row['count']) . ' ' .
sprintf($this->_('(pages: %s)'), implode(', ', $ids)) . ' '; sprintf($this->_('(page IDs: %s)'), implode(', ', $ids)) . ' ';
} }
$session->error($msg, Notice::noGroup); $this->error($msg, Notice::noGroup | Notice::allowMarkdown);
} else if($result && $verbose) { } else if($result && $verbose) {
$session->message($this->_('Added unique index')); $this->message($this->_('Added unique index') . " ($field->name)", Notice::noGroup);
} }
} else if($hasUnique && !$useUnique) { } else if($hasUnique && !$useUnique) {
// remove unique index // remove unique index
$result = $this->setUniqueIndex($field, false); $result = $this->setUniqueIndex($field, false);
if($result && $verbose) $session->message($this->_('Removed unique index')); if($result && $verbose) $this->message($this->_('Removed unique index') . " ($field->name)", Notice::noGroup);
} }
$checking = false; $checking = false;

2
wire/core/Pageimage.php
View File

@@ -848,7 +848,7 @@ class Pageimage extends Pagefile {
// create a new resize if it doesn't already exist or forceNew option is set // create a new resize if it doesn't already exist or forceNew option is set
if(!$filenameFinalExists && !file_exists($this->filename())) { if(!$filenameFinalExists && !file_exists($this->filename())) {
// no original file exists to create variation from // no original file exists to create variation from
$this->error = "Original image does not exist to create size variation"; $this->error = "Original image does not exist to create size variation: " . $this->url();
} else if(!$filenameFinalExists || $options['forceNew']) { } else if(!$filenameFinalExists || $options['forceNew']) {

9
wire/core/PagesNames.php
View File

@@ -294,8 +294,8 @@ class PagesNames extends Wire {
$format = empty($options['format']) ? '' : $options['format']; $format = empty($options['format']) ? '' : $options['format'];
} }
/** @var Languages|null $languages */ $languages = $this->wire()->languages;
$languages = $this->wire('languages'); $sanitizer = $this->wire()->sanitizer;
$options = array_merge($defaults, $options); $options = array_merge($defaults, $options);
if(!strlen($format)) $format = $this->defaultPageNameFormat($page); if(!strlen($format)) $format = $this->defaultPageNameFormat($page);
@@ -354,7 +354,7 @@ class PagesNames extends Wire {
$name = wireDate($format); $name = wireDate($format);
$formatType = 'date'; $formatType = 'date';
} else if($this->wire('sanitizer')->fieldName($format) === $format) { } else if($sanitizer->fieldName($format) === $format) {
// single field name or predefined string // single field name or predefined string
// this can also return null, which falls back to if() statement below // this can also return null, which falls back to if() statement below
$name = (string) $page->getUnformatted($format); $name = (string) $page->getUnformatted($format);
@@ -395,8 +395,7 @@ class PagesNames extends Wire {
if(strlen($name) > $this->nameMaxLength) $name = $this->adjustNameLength($name); if(strlen($name) > $this->nameMaxLength) $name = $this->adjustNameLength($name);
$utf8 = $this->wire('config')->pageNameCharset === 'UTF8'; $utf8 = $this->wire()->config->pageNameCharset === 'UTF8';
$sanitizer = $this->wire('sanitizer');
$name = $utf8 ? $sanitizer->pageNameUTF8($name) : $sanitizer->pageName($name, Sanitizer::translate); $name = $utf8 ? $sanitizer->pageNameUTF8($name) : $sanitizer->pageName($name, Sanitizer::translate);
if($language) $languages->unsetLanguage(); if($language) $languages->unsetLanguage();