inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
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
This commit is contained in:
Mike Hatfield
2008-12-17 10:47:27 +00:00
parent c5bdc7f05b
commit ff1d5359e9
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/alfresco/templates/webscripts/org/alfresco/repository/invite/invite.get.json.ftl
View File

@@ -1,3 +1,4 @@
<#escape x as jsonUtils.encodeJSONString(x)>
{ {
"action" : "${action}", "action" : "${action}",
<#if inviteId??> <#if inviteId??>
@@ -21,4 +22,5 @@
<#if siteShortName??> <#if siteShortName??>
"siteShortName" : "${siteShortName}" "siteShortName" : "${siteShortName}"
</#if> </#if>
} }
</#escape>

10
config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/action/action.lib.js
View File

@@ -36,11 +36,11 @@ function main()
// Resolve path if available // Resolve path if available
var path = url.templateArgs.path; var path = url.templateArgs.path;
// Path might be null for the root folder // Path might be null for the root folder
if (!path) if (!path)
{ {
path = ""; path = "";
} }
// Remove any leading or trailing "/" from the path // Remove any leading or trailing "/" from the path
// Fix-up parent path to have no leading or trailing slashes // Fix-up parent path to have no leading or trailing slashes
if (path.length > 0) if (path.length > 0)