Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
d13fdbdb
Unverified
Commit
d13fdbdb
authored
4 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
fix(core) Remove {literal} smarty tag from button column
issue
#6071
parent
3c3238e7
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
include/management/snapshot/class_SnapshotAttribute.inc
+2
-1
include/management/snapshot/class_SnapshotAttribute.inc
include/simpleplugin/attributes/class_SetAttribute.inc
+8
-4
include/simpleplugin/attributes/class_SetAttribute.inc
include/simpleplugin/class_Attribute.inc
+4
-4
include/simpleplugin/class_Attribute.inc
with
14 additions
and
9 deletions
+14
-9
include/management/snapshot/class_SnapshotAttribute.inc
+
2
−
1
View file @
d13fdbdb
...
@@ -107,7 +107,8 @@ class SnapshotsAttribute extends OrderedArrayAttribute
...
@@ -107,7 +107,8 @@ class SnapshotsAttribute extends OrderedArrayAttribute
'title'
=>
_
(
'Restore'
),
'title'
=>
_
(
'Restore'
),
'alt'
=>
_
(
'Restore'
),
'alt'
=>
_
(
'Restore'
),
'class'
=>
'center'
'class'
=>
'center'
]
],
FALSE
)
.
$img
;
)
.
$img
;
$nbicons
++
;
$nbicons
++
;
...
...
This diff is collapsed.
Click to expand it.
include/simpleplugin/attributes/class_SetAttribute.inc
+
8
−
4
View file @
d13fdbdb
...
@@ -546,7 +546,8 @@ class OrderedArrayAttribute extends SetAttribute
...
@@ -546,7 +546,8 @@ class OrderedArrayAttribute extends SetAttribute
'alt'
=>
_
(
'Sort up'
),
'alt'
=>
_
(
'Sort up'
),
'class'
=>
'center'
,
'class'
=>
'center'
,
'formnovalidate'
=>
'formnovalidate'
,
'formnovalidate'
=>
'formnovalidate'
,
]
],
FALSE
);
);
}
else
{
}
else
{
$img
.
=
'<img src="images/empty.png" alt="" style="width:16px;"/>'
;
$img
.
=
'<img src="images/empty.png" alt="" style="width:16px;"/>'
;
...
@@ -560,7 +561,8 @@ class OrderedArrayAttribute extends SetAttribute
...
@@ -560,7 +561,8 @@ class OrderedArrayAttribute extends SetAttribute
'alt'
=>
_
(
'Sort down'
),
'alt'
=>
_
(
'Sort down'
),
'class'
=>
'center'
,
'class'
=>
'center'
,
'formnovalidate'
=>
'formnovalidate'
,
'formnovalidate'
=>
'formnovalidate'
,
]
],
FALSE
);
);
}
else
{
}
else
{
$img
.
=
'<img src="images/empty.png" alt="" style="width:16px;"/>'
;
$img
.
=
'<img src="images/empty.png" alt="" style="width:16px;"/>'
;
...
@@ -576,7 +578,8 @@ class OrderedArrayAttribute extends SetAttribute
...
@@ -576,7 +578,8 @@ class OrderedArrayAttribute extends SetAttribute
'alt'
=>
_
(
'Edit'
),
'alt'
=>
_
(
'Edit'
),
'class'
=>
'center'
,
'class'
=>
'center'
,
'formnovalidate'
=>
'formnovalidate'
,
'formnovalidate'
=>
'formnovalidate'
,
]
],
FALSE
);
);
}
}
$img
.
=
$this
->
renderInputField
(
$img
.
=
$this
->
renderInputField
(
...
@@ -587,7 +590,8 @@ class OrderedArrayAttribute extends SetAttribute
...
@@ -587,7 +590,8 @@ class OrderedArrayAttribute extends SetAttribute
'alt'
=>
_
(
'Delete'
),
'alt'
=>
_
(
'Delete'
),
'class'
=>
'center'
,
'class'
=>
'center'
,
'formnovalidate'
=>
'formnovalidate'
,
'formnovalidate'
=>
'formnovalidate'
,
]
],
FALSE
);
);
return
[
$img
,
$nbicons
];
return
[
$img
,
$nbicons
];
...
...
This diff is collapsed.
Click to expand it.
include/simpleplugin/class_Attribute.inc
+
4
−
4
View file @
d13fdbdb
...
@@ -787,16 +787,16 @@ class Attribute
...
@@ -787,16 +787,16 @@ class Attribute
return
(
$this
->
getValue
()
==
$value
);
return
(
$this
->
getValue
()
==
$value
);
}
}
protected
function
renderInputField
(
string
$type
,
string
$name
,
array
$attributes
=
[]):
string
protected
function
renderInputField
(
string
$type
,
string
$name
,
array
$attributes
=
[]
,
bool
$smartyEscape
=
TRUE
):
string
{
{
$input
=
'
{literal}
<input type="'
.
htmlescape
(
$type
)
.
'" '
.
$input
=
'<input type="'
.
htmlescape
(
$type
)
.
'" '
.
'name="'
.
htmlescape
(
$name
)
.
'" id="'
.
htmlescape
(
$name
)
.
'"'
.
'name="'
.
htmlescape
(
$name
)
.
'" id="'
.
htmlescape
(
$name
)
.
'"'
.
(
$this
->
disabled
?
' disabled="disabled"'
:
''
);
(
$this
->
disabled
?
' disabled="disabled"'
:
''
);
foreach
(
$attributes
as
$label
=>
$value
)
{
foreach
(
$attributes
as
$label
=>
$value
)
{
$input
.
=
' '
.
$label
.
'="'
.
htmlescape
(
$value
)
.
'"'
;
$input
.
=
' '
.
$label
.
'="'
.
htmlescape
(
$value
)
.
'"'
;
}
}
$input
.
=
'/>
{/literal}
'
;
$input
.
=
'/>'
;
return
$input
;
return
(
$smartyEscape
?
'{literal}'
.
$input
.
'{/literal}'
:
$input
)
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets