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

Fix issue processwire/processwire-issues#870

Browse Source
This commit is contained in:
Ryan Cramer
2019-06-27 12:26:59 -04:00
parent e1a664826f
commit 52405a6a77
1 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
wire/modules/Process/ProcessField/ProcessField.module
View File

@@ -1769,12 +1769,8 @@ class ProcessField extends Process implements ConfigurableModule {
$cloneFieldName = $this->wire('sanitizer')->fieldName(substr($type, 1)); $cloneFieldName = $this->wire('sanitizer')->fieldName(substr($type, 1));
$cloneField = $this->wire('fields')->get($cloneFieldName); $cloneField = $this->wire('fields')->get($cloneFieldName);
if($cloneField) { if($cloneField) {
$this->field = $this->wire('fields')->clone($cloneField, $name); $this->field = $this->cloneField($cloneField, $name);
if($this->field) { if(!$this->field) throw new WireException("Error cloning $cloneFieldName");
// cloned
} else {
throw new WireException("Error cloning $cloneFieldName");
}
} }
} }
} }
@@ -1850,24 +1846,19 @@ class ProcessField extends Process implements ConfigurableModule {
$cloneField = $this->form->get('_clone_field'); $cloneField = $this->form->get('_clone_field');
$cloneName = $cloneField ? $cloneField->attr('value') : ''; $cloneName = $cloneField ? $cloneField->attr('value') : '';
if($cloneName && $this->isAllowedName($cloneName)) { if($cloneName) {
$clone = $this->fields->clone($this->field); $clone = $this->cloneField($this->field, $cloneName);
if($clone && $clone->id) { if($clone && $clone->id) {
$clone->name = $cloneName;
if($clone->label) $clone->label = $clone->label . ' ' . $this->_('(copy)');
try { try {
$this->fields->save($clone); $this->fields->save($clone);
$this->message($this->_('Cloned Field') . " - {$this->field->name} => {$clone->name}");
if(!count($errors)) { if(!count($errors)) {
if($clone->type instanceof FieldtypeFieldsetOpen) $clone->set('closeFieldID', null);
$this->fieldAdded($clone); $this->fieldAdded($clone);
$this->wire('session')->message($this->_('You are now editing the field you cloned.')); $this->wire('session')->message($this->_('You are now editing the field you cloned.'));
$this->wire('session')->redirect("./edit?id=$clone->id#basics"); $this->wire('session')->redirect("./edit?id=$clone->id#basics");
} }
} catch(\Exception $e) { } catch(\Exception $e) {
$errors[] = $e->getMessage(); $errors[] = $e->getMessage();
} }
// $this->listAfterSave = true;
} else { } else {
$errors[] = ($this->_("Error creating clone of this field") . " - {$this->field->name}"); $errors[] = ($this->_("Error creating clone of this field") . " - {$this->field->name}");
} }
@@ -1914,6 +1905,33 @@ class ProcessField extends Process implements ConfigurableModule {
return ''; return '';
} }
/**
* Clone $cloneField to create a new field with given name
*
* @param Field $cloneField
* @param string $name Name of new field
* @return bool|Field
*
*/
protected function cloneField(Field $cloneField, $name) {
if(!$this->isAllowedName($name)) return false;
/** @var Fields $fields */
$fields = $this->wire('fields');
if($fields->get($name)) return false;
$field = $fields->clone($cloneField, $name);
if(!$field) return false;
$field->label = $field->label . ' ' . $this->_('(copy)');
$this->message($this->_('Cloned Field') . " - $field->name => $cloneField->name");
if($field->type instanceof FieldtypeFieldsetOpen && strpos($cloneField->name, '_END') === false) {
// handle a cloned fieldset by also cloning its closer
$field->set('closeFieldID', null);
}
return $field;
}
/** /**
* Is the given field name allowed to use for a new or cloned field * Is the given field name allowed to use for a new or cloned field
* *
@@ -2384,7 +2402,9 @@ class ProcessField extends Process implements ConfigurableModule {
public function ___executeSendTemplatesSave() { public function ___executeSendTemplatesSave() {
if(!$this->field || !$this->field->id) throw new WireException('No field specified'); if(!$this->field || !$this->field->id) throw new WireException('No field specified');
$this->wire('session')->CSRF->validate(); /** @var Session $session */
$session = $this->wire('session');
$session->CSRF->validate();
$isFieldset = false; $isFieldset = false;
$fields = array($this->field); $fields = array($this->field);