Skip to content
GitLab
Commit e049debd authored by Côme Chilliet's avatar Côme Chilliet
Browse files

Merge branch... 

Merge branch '6044-orderedarrayattribute-action-images-should-have-formnovalidate-attribute' into '1.4-dev'

Resolve "OrderedArrayAttribute action images should have formnovalidate attribute"

See merge request fusiondirectory/fd!704
parents dad261fe a0df3aaa
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving core-php8 master fusiondirectory-1.5 fusiondirectory-1.4
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 16 deletions
+20 -16
include/simpleplugin/attributes/class_SetAttribute.inc
+ 20
− 16
View file @ e049debd
...@@ -523,10 +523,11 @@ class OrderedArrayAttribute extends SetAttribute ...@@ -523,10 +523,11 @@ class OrderedArrayAttribute extends SetAttribute
$img .= $this->renderInputField( $img .= $this->renderInputField(
'image', $id.'_up_'.$key, 'image', $id.'_up_'.$key,
[ [
'src' => 'geticon.php?context=actions&icon=view-sort-descending&size=16', 'src' => 'geticon.php?context=actions&icon=view-sort-descending&size=16',
'title' => _('Sort up'), 'title' => _('Sort up'),
'alt' => _('Sort up'), 'alt' => _('Sort up'),
'class' => 'center' 'class' => 'center',
'formnovalidate' => 'formnovalidate',
] ]
); );
} else { } else {
...@@ -536,10 +537,11 @@ class OrderedArrayAttribute extends SetAttribute ...@@ -536,10 +537,11 @@ class OrderedArrayAttribute extends SetAttribute
$img .= $this->renderInputField( $img .= $this->renderInputField(
'image', $id.'_down_'.$key, 'image', $id.'_down_'.$key,
[ [
'src' => 'geticon.php?context=actions&icon=view-sort-ascending&size=16', 'src' => 'geticon.php?context=actions&icon=view-sort-ascending&size=16',
'title' => _('Sort down'), 'title' => _('Sort down'),
'alt' => _('Sort down'), 'alt' => _('Sort down'),
'class' => 'center' 'class' => 'center',
'formnovalidate' => 'formnovalidate',
] ]
); );
} else { } else {
...@@ -551,20 +553,22 @@ class OrderedArrayAttribute extends SetAttribute ...@@ -551,20 +553,22 @@ class OrderedArrayAttribute extends SetAttribute
$img .= $this->renderInputField( $img .= $this->renderInputField(
'image', $id.'_edit_'.$key, 'image', $id.'_edit_'.$key,
[ [
'src' => 'geticon.php?context=actions&icon=document-edit&size=16', 'src' => 'geticon.php?context=actions&icon=document-edit&size=16',
'title' => _('Edit'), 'title' => _('Edit'),
'alt' => _('Edit'), 'alt' => _('Edit'),
'class' => 'center' 'class' => 'center',
'formnovalidate' => 'formnovalidate',
] ]
); );
} }
$img .= $this->renderInputField( $img .= $this->renderInputField(
'image', $id.'_del_'.$key, 'image', $id.'_del_'.$key,
[ [
'src' => 'geticon.php?context=actions&icon=edit-delete&size=16', 'src' => 'geticon.php?context=actions&icon=edit-delete&size=16',
'title' => _('Delete'), 'title' => _('Delete'),
'alt' => _('Delete'), 'alt' => _('Delete'),
'class' => 'center' 'class' => 'center',
'formnovalidate' => 'formnovalidate',
] ]
); );
......
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