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 V2.1 to HEAD

Browse Source 
6938: Fix for WCM-864 (bulk import of ZIP containing only directories and no files)
   6939: Fix for AWC-1602. Workaround for MSIE7 DOM access methods in Javascript.
   6942: Fixed bug in transaction demarcation around the patch service.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7349 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-11-12 14:40:12 +00:00
parent 3cf0420a73
commit f9a456f870
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/web/bean/wcm/ImportWebsiteDialog.java
View File

@@ -310,7 +310,10 @@ public class ImportWebsiteDialog
} }
finally finally
{ {
ImporterActionExecuter.deleteDir(tempDir); if (tempDir.exists())
{
ImporterActionExecuter.deleteDir(tempDir);
}
} }
} }
catch (IOException e) catch (IOException e)
@@ -330,6 +333,7 @@ public class ImportWebsiteDialog
ServiceRegistry services = Repository.getServiceRegistry(FacesContext.getCurrentInstance()); ServiceRegistry services = Repository.getServiceRegistry(FacesContext.getCurrentInstance());
MimetypeService mimetypeService = services.getMimetypeService(); MimetypeService mimetypeService = services.getMimetypeService();
File topdir = new File(dir); File topdir = new File(dir);
if (!topdir.exists()) return;
for (File file : topdir.listFiles()) for (File file : topdir.listFiles())
{ {
try try

8
source/web/scripts/ajax/myspaces.js
View File

@@ -504,7 +504,7 @@ var MySpaces = {
var panel = $E(".spaceCreateSpacePanel", $(actionEl).getParent()); var panel = $E(".spaceCreateSpacePanel", $(actionEl).getParent());
panel.setStyle("opacity", 0); panel.setStyle("opacity", 0);
panel.setStyle("display", "inline"); panel.setStyle("display", "inline");
panel.getElementById("space-name").removeClass("spaceFormItemError"); panel.getElementsBySelector('#space-name').removeClass("spaceFormItemError");
Alfresco.Dom.smartAlignElement(panel, panel.getParent()); Alfresco.Dom.smartAlignElement(panel, panel.getParent());
// make into a dragable panel // make into a dragable panel
@@ -543,9 +543,9 @@ var MySpaces = {
{ {
if (spaceName.test(/(.*[\"\*\\\>\<\?\/\:\|]+.*)|(.*[\.]?.*[\.]+$)|(.*[ ]+$)/i)) if (spaceName.test(/(.*[\"\*\\\>\<\?\/\:\|]+.*)|(.*[\.]?.*[\.]+$)|(.*[ ]+$)/i))
{ {
var spaceName = panel.getElementById("space-name"); // Different object access methods to workaround MSIE7 problem
spaceName.addClass("spaceFormItemError"); panel.getElementsBySelector('#space-name').addClass("spaceFormItemError");
spaceName.focus(); panel.getElementById("space-name").focus();
} }
else else
{ {