Author: woonsan
Date: Sun Aug 12 18:37:12 2007
New Revision: 565220
URL: http://svn.apache.org/viewvc?view=rev&rev=565220
Log:
JS2-758: Ukrainian symbols doesn't save through Portal Site Manager
Besides Portal Site Manager, Permissions Admin UI pages and Constraints Admin
UI pages have escape() Javascript function calls to disable to use non-ascii
characters for permission names and resource names.
The function calls are replaced with encodeURIComponent().
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm?view=diff&rev=565220&r1=565219&r2=565220
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/security/permissions/view.vm
Sun Aug 12 18:37:12 2007
@@ -476,11 +476,11 @@
}
requestUrl += "&type=" + tTableWidget.js_type;
- requestUrl += "&resource=" + escape( selectedRowData.name );
- requestUrl += "&roles=" + escape( selectedRowData.roles );
- requestUrl += "&actions=" + escape( selectedRowData.actions );
- requestUrl += "&oldactions=" + escape( masterData.actions );
-
+ requestUrl += "&resource=" + encodeURIComponent( selectedRowData.name );
+ requestUrl += "&roles=" + encodeURIComponent( selectedRowData.roles );
+ requestUrl += "&actions=" + encodeURIComponent( selectedRowData.actions );
+ requestUrl += "&oldactions=" + encodeURIComponent( masterData.actions );
+
var mimeType = "text/xml";
dojo.io.bind({
Modified:
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm?view=diff&rev=565220&r1=565219&r2=565220
==============================================================================
---
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
(original)
+++
portals/jetspeed-2/trunk/applications/j2-admin/src/webapp/WEB-INF/view/security/constraints/constraints-view.vm
Sun Aug 12 18:37:12 2007
@@ -628,7 +628,7 @@
var contextPath = document.location.protocol + "/" + "/" +
document.location.host + "$req.ContextPath";
var requestUrl = contextPath + "/ajaxapi?action=constraints" ;
- requestUrl += "&name=" + escape( selectedRowData.name );
+ requestUrl += "&name=" + encodeURIComponent( selectedRowData.name );
if ( removeEntry )
{
requestUrl += "&method=remove-def";
@@ -667,7 +667,7 @@
}
xmlData += '</security-constraints-def>';
- requestUrl += "&xml=" + escape( xmlData );
+ requestUrl += "&xml=" + encodeURIComponent( xmlData );
var mimeType = "text/xml";
dojo.io.bind({
@@ -714,7 +714,7 @@
var contextPath = document.location.protocol + "/" + "/" +
document.location.host + "$req.ContextPath";
var requestUrl = contextPath + "/ajaxapi?action=constraints" ;
- requestUrl += "&name=" + escape( selectedRowData.name );
+ requestUrl += "&name=" + encodeURIComponent( selectedRowData.name );
if ( removeEntry )
{
requestUrl += "&method=remove-global";
@@ -731,7 +731,7 @@
var xmlData = '<global-security-constraints-ref>' + dojo.string.escapeXml(
selectedRowData.name, true ) + '</global-security-constraints-ref>';
- requestUrl += "&xml=" + escape( xmlData );
+ requestUrl += "&xml=" + encodeURIComponent( xmlData );
var mimeType = "text/xml";
dojo.io.bind({
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
