You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2017/11/06 22:17:29 UTC
[28/35] roller git commit: Correct Struts2 syntax for
getting directory name
Correct Struts2 <s:property> syntax for getting directory name
Project: http://git-wip-us.apache.org/repos/asf/roller/repo
Commit: http://git-wip-us.apache.org/repos/asf/roller/commit/9a597e21
Tree: http://git-wip-us.apache.org/repos/asf/roller/tree/9a597e21
Diff: http://git-wip-us.apache.org/repos/asf/roller/diff/9a597e21
Branch: refs/heads/master
Commit: 9a597e210602042b3da0fa3c2069771e039cb105
Parents: 213c0b5
Author: Dave Johnson <sn...@gmail.com>
Authored: Sun Oct 15 16:41:21 2017 -0400
Committer: Dave Johnson <sn...@gmail.com>
Committed: Sun Oct 15 16:41:21 2017 -0400
----------------------------------------------------------------------
app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/roller/blob/9a597e21/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
----------------------------------------------------------------------
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
index eb90e11..163a869 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
@@ -209,7 +209,7 @@
<s:else>
<p class="subtitle">
- <s:text name="mediaFileView.folderName"/>: <s:text name="currentDirectory.name" />
+ <s:text name="mediaFileView.folderName"/>: <s:property value="%{currentDirectory.name}" />
</p>
<p class="pagetip">
<s:text name="mediaFileView.dirPageTip" />