[portal-commits] JBoss Portal SVN: r12044 - in branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF: jsp/cms/admin and 1 other directory.
Author: mputz
Date: 2008-10-07 11:31:16 -0400 (Tue, 07 Oct 2008)
New Revision: 12044
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
Log:
JBPORTAL-2161 - Special character in filename generates NullPointerException
JBPORTAL-2162 - Special character in foldername throws RepositoryException
(Fixing incorrect ui display if filename contains double quote)
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties
===================================================================
---
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-10-07
14:52:43 UTC (rev 12043)
+++
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource.properties 2008-10-07
15:31:16 UTC (rev 12044)
@@ -136,5 +136,5 @@
CMS_ACCESS_DENIED_DESCRIPTION=You are not allowed to access this resource
CMS_ACCESS_DENIED_DESCRIPTION_PATH=You are not allowed to access the resource
-CMS_FILENAME_INVALID=File Name is invalid. It may contain illegal characters
-CMS_FOLDERNAME_INVALID=Folder Name is invalid. It may contain illegal characters
+CMS_FILENAME_INVALID=File Name is invalid. It may not contain illegal characters such as
'.', '/', ':', '[', ']', '*',
''', '"', '|' or any whitespace character.
+CMS_FOLDERNAME_INVALID=Folder Name is invalid. It may not contain illegal characters such
as '.', '/', ':', '[', ']', '*',
''', '"', '|' or any whitespace character.
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp
===================================================================
---
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-10-07
14:52:43 UTC (rev 12043)
+++
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/confirmcreatecollection.jsp 2008-10-07
15:31:16 UTC (rev 12044)
@@ -57,14 +57,14 @@
<tr>
<td
valign="bottom">${n:i18n("CMS_NAME")}:</td>
<td align="left"><input
class="portlet-form-input-field" type="text"
- name="newcollectionname"
size="40" maxlength="50"
value="<%=newcollectionname%>">
+ name="newcollectionname"
size="40" maxlength="50"
value="<%=newcollectionname.replace("\"",
""")%>">
</td>
</tr>
<tr>
<td
valign="bottom">${n:i18n("CMS_DESCRIPTION")}:</td>
<td align="left"><input
class="portlet-form-input-field" type="text"
name="newcollectiondescription"
- size="40"
maxlength="80" <%=newcollectiondescription%>
value="<%=newcollectiondescription%>">
+ size="40"
maxlength="80"
value="<%=newcollectiondescription.replace("\"",
""")%>">
</td>
</tr>
<tr>
Modified:
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
---
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-07
14:52:43 UTC (rev 12043)
+++
branches/JBoss_Portal_2_6_6_JBPORTAL-2109/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-07
15:31:16 UTC (rev 12044)
@@ -134,7 +134,7 @@
<input
type="text" name="filename"
class="portlet-form-input-field"
- value="<%=fileName%>"
+ value="<%=fileName.replace("\"",
""")%>"
/>
: ${n:i18n("CMS_REQUIRED")}
</td>