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

redirects all repo requests to our instead of packages

Browse Source
This commit is contained in:
perploug
2013-11-14 09:04:10 +01:00
parent 8dab2148f1
commit bf93d773a8
5 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
View File

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings
set { base["guid"] = value; }
}
[ConfigurationProperty("repositoryurl", DefaultValue = "http://packages.umbraco.org")]
[ConfigurationProperty("repositoryurl", DefaultValue = "http://our.umbraco.org")]
public string RepositoryUrl
{
get { return (string)base["repositoryurl"]; }

27
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
View File

@@ -124,9 +124,11 @@ namespace umbraco
case "BrowseRepository.aspx":
/*
//Gets all the repositories registered in umbracoSettings.config
var repos = cms.businesslogic.packager.repositories.Repository.getAll();
//if more then one repo, then list them as child nodes under the "Install from repository" node.
// the repositories will then be fetched from the loadPackages class.
if (repos.Count > 1)
@@ -136,24 +138,17 @@ namespace umbraco
xNode.Text = ui.Text("treeHeaders", "repositories");
xNode.HasChildren = true;
}
*/
//if only one repo, then just list it directly and name it as the repository.
//the packages will be loaded from the loadPackages class with a repoAlias querystring
else if (repos.Count == 1)
{
xNode.Text = repos[0].Name;
xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repos[0].Guid + "&rnd=" + Guid.NewGuid();
xNode.NodeType = "packagesRepository";
xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?repoGuid=" + repos[0].Guid + "');";
xNode.Icon = "icon-server-alt";
xNode.HasChildren = true;
}
//if none registered, then remove the repo node.
else if (repos.Count == 0)
{
xNode.Text = "";
}
var repos = cms.businesslogic.packager.repositories.Repository.getAll();
xNode.Text = repos[0].Name;
xNode.Source = "tree.aspx?app=" + this._app + "&id=" + this._id + "&treeType=packagerPackages&packageType=repository&repoGuid=" + repos[0].Guid + "&rnd=" + Guid.NewGuid();
xNode.NodeType = "packagesRepository";
xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?repoGuid=" + repos[0].Guid + "');";
xNode.Icon = "icon-server-alt";
xNode.HasChildren = true;
break;

24
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
View File

@@ -112,22 +112,18 @@ namespace umbraco
case "repository":
_repoGuid = HttpContext.Current.Request.QueryString["repoGuid"];
var currentRepo = cms.businesslogic.packager.repositories.Repository.getByGuid(_repoGuid);
if (currentRepo != null)
Umbraco.Web.org.umbraco.our.Repository r = new Umbraco.Web.org.umbraco.our.Repository();
foreach (var cat in r.Categories(_repoGuid))
{
foreach (cms.businesslogic.packager.repositories.Category cat in currentRepo.Webservice.Categories(currentRepo.Guid))
{
XmlTreeNode xNode = XmlTreeNode.Create(this);
xNode.Text = cat.Text;
xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?category=" + cat.Id + "&repoGuid=" + currentRepo.Guid + "');";
xNode.Icon = "icon-folder";
xNode.OpenIcon = "icon-folder";
xNode.NodeType = "packagesCategory" + cat.Id;
tree.Add(xNode);
}
XmlTreeNode xNode = XmlTreeNode.Create(this);
xNode.Text = cat.Text;
xNode.Action = "javascript:openPackageCategory('BrowseRepository.aspx?category=" + cat.Id + "&repoGuid=" + _repoGuid + "');";
xNode.Icon = "icon-folder";
xNode.OpenIcon = "icon-folder";
xNode.NodeType = "packagesCategory" + cat.Id;
tree.Add(xNode);
}
break;
}

2
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
View File

@@ -49,7 +49,7 @@ namespace umbraco.presentation.developer.packages {
iframeGen.Text =
string.Format(
"<iframe id=\"repoFrame\" frameborder=\"1\" style=\"border: none; display: block\" src=\"{0}?repoGuid={1}{2}&callback={3}:{4}{5}/developer/packages/proxy.htm?/{6}/developer/packages/installer.aspx?repoGuid={7}&version=v45&fullVersion={8}.{9}.{10}&useLegacySchema={11}&dotnetVersion={12}&trustLevel={13}\"></iframe>",
"<iframe id=\"repoFrame\" frameborder=\"1\" style=\"border: none; display: block\" src=\"{0}/repo/?repoGuid={1}{2}&callback={3}:{4}{5}/developer/packages/proxy.htm?/{6}/developer/packages/installer.aspx?repoGuid={7}&version=v45&fullVersion={8}.{9}.{10}&useLegacySchema={11}&dotnetVersion={12}&trustLevel={13}\"></iframe>",
url, repoGuid, category, Request.ServerVariables["SERVER_NAME"],
Request.ServerVariables["SERVER_PORT"], IOHelper.ResolveUrl(SystemDirectories.Umbraco),
IOHelper.ResolveUrl(SystemDirectories.Umbraco).Trim('/'), repoGuid,

2
src/umbraco.cms/businesslogic/Packager/Repositories/RepositoryWebservice.cs
View File

@@ -53,7 +53,7 @@ namespace umbraco.cms.businesslogic.packager.repositories
/// <remarks/>
public RepositoryWebservice(string url)
{
this.Url = url;//"http://packages.umbraco.org/umbraco/webservices/api/repository.asmx";
this.Url = url;//"http://our.umbraco.org/umbraco/webservices/api/repository.asmx";
}
/// <remarks/>