yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes 27749

Browse Source 
[TFS Changeset #70389]
This commit is contained in:
hartvig
2010-06-21 08:18:50 +00:00
parent 3010d62a8d
commit b6f1d288fc
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
umbraco/cms/businesslogic/Packager/PackageInstance/CreatedPackage.cs
View File

@@ -102,7 +102,7 @@ namespace umbraco.cms.businesslogic.packager {
int outInt = 0;
//Path checking...
string localPath = IOHelper.MapPath(Settings.PackagesStorage + "/" + pack.Folder);
string localPath = IOHelper.MapPath(IO.SystemDirectories.Media + "/" + pack.Folder);
if (!System.IO.Directory.Exists(localPath))
System.IO.Directory.CreateDirectory(localPath);
@@ -238,7 +238,14 @@ namespace umbraco.cms.businesslogic.packager {
//string packPath = Settings.PackagerRoot.Replace(System.IO.Path.DirectorySeparatorChar.ToString(), "/") + "/" + pack.Name.Replace(' ', '_') + "_" + pack.Version.Replace(' ', '_') + "." + Settings.PackageFileExtension;
string packPath = Settings.PackagerRoot + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension;
// check if there's a packages directory below media
string packagesDirectory = IO.SystemDirectories.Media + "/created-packages";
if (!System.IO.Directory.Exists(IOHelper.MapPath(packagesDirectory)))
System.IO.Directory.CreateDirectory(IOHelper.MapPath(packagesDirectory));
string packPath = packagesDirectory + "/" + (pack.Name + "_" + pack.Version).Replace(' ', '_') + "." + Settings.PackageFileExtension;
utill.ZipPackage(localPath, IOHelper.MapPath(packPath));
pack.PackagePath = packPath;

2
umbraco/presentation/umbraco/developer/Packages/editPackage.aspx.cs
View File

@@ -197,7 +197,7 @@ namespace umbraco.presentation.developer.packages
if (!string.IsNullOrEmpty(pack.PackagePath)) {
packageUmbFile.Text = " &nbsp; <a href='" + pack.PackagePath + "'>Download</a>";
packageUmbFile.Text = " &nbsp; <a href='" + IO.IOHelper.ResolveUrl(pack.PackagePath) + "'>Download</a>";
this.ClientTools.ShowSpeechBubble(BasePages.BasePage.speechBubbleIcon.success, "Package saved and published", "");
} else {