Commit ec0bc1c9 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch 'cherry-pick-ed5b81c5' into '1.4-dev'

Merge branch '5853-add-button-for-setattribute-does-not-… into '1.4-dev'

See merge request fusiondirectory/fd!337
Showing with 2 additions and 2 deletions
+2 -2
...@@ -234,7 +234,7 @@ class SetAttribute extends Attribute ...@@ -234,7 +234,7 @@ class SetAttribute extends Attribute
'htmlid' => $this->getForHtmlId(), 'htmlid' => $this->getForHtmlId(),
'label' => '{literal}'.$this->getLabel().'{/literal}'.($this->isRequired() ? '{$must}' : ''), 'label' => '{literal}'.$this->getLabel().'{/literal}'.($this->isRequired() ? '{$must}' : ''),
'description' => ($this->isRequired() ? sprintf(_("%s (required)"), $this->getDescription()) : $this->getDescription()), 'description' => ($this->isRequired() ? sprintf(_("%s (required)"), $this->getDescription()) : $this->getDescription()),
'input' => $this->renderOnlyFormInput(), 'input' => $this->renderAcl($this->renderOnlyFormInput()),
); );
$this->handleEditingValue(); $this->handleEditingValue();
$this->attribute->renderAttribute($attributes, $readOnly); $this->attribute->renderAttribute($attributes, $readOnly);
...@@ -242,7 +242,7 @@ class SetAttribute extends Attribute ...@@ -242,7 +242,7 @@ class SetAttribute extends Attribute
'htmlid' => 'add'.$this->getHtmlId(), 'htmlid' => 'add'.$this->getHtmlId(),
'label' => '', 'label' => '',
'description' => '', 'description' => '',
'input' => $this->renderButtons(), 'input' => $this->renderAcl($this->renderButtons()),
); );
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment