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

Updates for processwire/processwire-issues#1588

Browse Source
This commit is contained in:
Ryan Cramer
2022-12-29 09:55:12 -05:00
parent d6c54bda6a
commit 90fc86f7cb
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wire/modules/Process/ProcessTemplate/ProcessTemplate.module
View File

@@ -104,7 +104,8 @@ class ProcessTemplate extends Process implements ConfigurableModule {
'templateNameFormat' => 'templateNameFormat' =>
$this->_('Template names may use letters (a-z A-Z), numbers (0-9), hyphens and underscores.') . ' ' . $this->_('Template names may use letters (a-z A-Z), numbers (0-9), hyphens and underscores.') . ' ' .
$this->_('Lowercase is optional but recommended.') . ' ' . $this->_('Lowercase is optional but recommended.') . ' ' .
$this->_('Do not include a file extension.'), $this->_('Do not include a file extension.') . ' ' .
$this->_('Do not use only digits.'),
'invalidTemplateName' => $this->_('Template name does not match required format.'), 'invalidTemplateName' => $this->_('Template name does not match required format.'),
'nameAlreadyInUse' => $this->_('The name "%s" is already in use'), 'nameAlreadyInUse' => $this->_('The name "%s" is already in use'),
'name' => $this->_('Name'), 'name' => $this->_('Name'),
@@ -581,7 +582,7 @@ class ProcessTemplate extends Process implements ConfigurableModule {
if(!$input->is('post')) { if(!$input->is('post')) {
// render form // render form
$form = $this->buildAddForm($templateFiles); $form = $this->buildAddForm($templateFiles);
if(count($this->input->post)) $form->processInput($this->input->post); if(count($input->post)) $form->processInput($input->post);
return $form->render(); return $form->render();
} }
@@ -605,6 +606,8 @@ class ProcessTemplate extends Process implements ConfigurableModule {
} }
$postTemplates = $input->post('templates'); $postTemplates = $input->post('templates');
if(!is_array($postTemplates)) $postTemplates = array();
$templateName = trim((string) $input->post('template_name')); $templateName = trim((string) $input->post('template_name'));
// add any templates without files to the postTemplates // add any templates without files to the postTemplates
@@ -617,7 +620,10 @@ class ProcessTemplate extends Process implements ConfigurableModule {
foreach($templateNames as $name) { foreach($templateNames as $name) {
$name = $sanitizer->name(basename($name)); $name = $sanitizer->name(basename($name));
if(!strlen($name)) continue; if(!strlen($name)) continue;
if(ctype_digit($name)) continue; if(ctype_digit($name)) {
$this->error(sprintf($this->_('Template name “%s” not added because it contains only digits.'), $name));
continue;
}
if($templates->get($name) || $fieldgroups->get($name)) { if($templates->get($name) || $fieldgroups->get($name)) {
$this->error(sprintf($this->labels['nameAlreadyInUse'], $name)); $this->error(sprintf($this->labels['nameAlreadyInUse'], $name));
} else { } else {
@@ -702,7 +708,7 @@ class ProcessTemplate extends Process implements ConfigurableModule {
if(count($templateFiles)) { if(count($templateFiles)) {
/** @var InputfieldCheckboxes $field */ /** @var InputfieldCheckboxes $field */
$field = $modules->get('InputfieldCheckboxes'); $field = $modules->get('InputfieldCheckboxes');
$field->label = sprintf($this->_('Templates found in: %s'), "$templateUrl*.{$this->config->templateExtension}"); $field->label = sprintf($this->_('Templates found in: %s'), "$templateUrl*.{$config->templateExtension}");
$field->description = $this->_('The following new templates were found. Check the box next to each template you want to add.'); // Templates found, description $field->description = $this->_('The following new templates were found. Check the box next to each template you want to add.'); // Templates found, description
$field->attr('id+name', 'templates'); $field->attr('id+name', 'templates');
$field->icon = 'search-plus'; $field->icon = 'search-plus';