From ff1d5359e90d7e0f46f2c74ccdf7fe3a090d36e2 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Wed, 17 Dec 2008 10:47:27 +0000 Subject: [PATCH] Merged V3.0 to HEAD 11303: ETHREEOH-305 - Spacing between the buttons: invite, customize site and customize dashboard, should be increased in IE7. 11304: JavaScript cleanup using JSLint 11305: New Sites menu styling. Removed an unecessay dotted line in the My Profile dashlet 11311: ETHREEOH-65 Links without pages don't appear in other color on Wiki page 11312: ETHREEOH-377 Full Screen preview in doc lib does not maximize the screen space. ETHREEOH-65 Links without pages don't appear in other color on Wiki page. 11316: ETHREEOH-298 JSON encoding step is missing on the repo webscript for invite - cannot invite user with XSS username. 11335: ETHREEOH-299 During the Site Invite process, user can invite themselves into a site with a different role. ETHREEOH-68 Invite button on Members page doesn't become disabled after users are added 11341: ETHREEOH-50 "Add Event" page is appeared in place of "Edit Event" after pressing "Edit" button. ETHREEOH-60 It is impossible to change "Destination type" for "Copy to ..." action for document 11354: ETHREEOH-391 Success message displays URL name after joining a site. ETHREEOH-306 Incorrect styling of text in description field in new folder dialog: Now OK in IE6 & 7. ETHREEOH-295 URL label in Create Site dialog is not correct: Expanded help text. ETHREEOH-374 A user can't click on tag in wiki page list to filter by that tag: Now its possible git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12431 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repository/invite/invite.get.json.ftl | 4 +++- .../slingshot/documentlibrary/action/action.lib.js | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl b/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl index c0ba334809..8513485bc6 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl @@ -1,3 +1,4 @@ +<#escape x as jsonUtils.encodeJSONString(x)> { "action" : "${action}", <#if inviteId??> @@ -21,4 +22,5 @@ <#if siteShortName??> "siteShortName" : "${siteShortName}" -} \ No newline at end of file +} + \ No newline at end of file diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js index 8a5845c07a..ece4b6bc79 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js @@ -36,11 +36,11 @@ function main() // Resolve path if available var path = url.templateArgs.path; - // Path might be null for the root folder - if (!path) - { - path = ""; - } + // Path might be null for the root folder + if (!path) + { + path = ""; + } // Remove any leading or trailing "/" from the path // Fix-up parent path to have no leading or trailing slashes if (path.length > 0)