From bf93d773a8a028fb7bf8bb9e7a2f5e53344db3b5 Mon Sep 17 00:00:00 2001 From: perploug Date: Thu, 14 Nov 2013 09:04:10 +0100 Subject: [PATCH] redirects all repo requests to our instead of packages --- .../UmbracoSettings/RepositoryElement.cs | 2 +- .../umbraco/Trees/loadPackager.cs | 27 ++++++++----------- .../umbraco/Trees/loadPackages.cs | 24 +++++++---------- .../Packages/BrowseRepository.aspx.cs | 2 +- .../Repositories/RepositoryWebservice.cs | 2 +- 5 files changed, 24 insertions(+), 33 deletions(-) diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs index b7a1157c40..21319f01e4 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs @@ -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"]; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs index a8cfcc12c5..196c5ab46d 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs @@ -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; diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs index 4ae493b038..baefe56c6b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs @@ -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; } diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs index 696aa8534a..90538bfb33 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs @@ -49,7 +49,7 @@ namespace umbraco.presentation.developer.packages { iframeGen.Text = string.Format( - "", + "", url, repoGuid, category, Request.ServerVariables["SERVER_NAME"], Request.ServerVariables["SERVER_PORT"], IOHelper.ResolveUrl(SystemDirectories.Umbraco), IOHelper.ResolveUrl(SystemDirectories.Umbraco).Trim('/'), repoGuid, diff --git a/src/umbraco.cms/businesslogic/Packager/Repositories/RepositoryWebservice.cs b/src/umbraco.cms/businesslogic/Packager/Repositories/RepositoryWebservice.cs index fb8f770391..ccf8566687 100644 --- a/src/umbraco.cms/businesslogic/Packager/Repositories/RepositoryWebservice.cs +++ b/src/umbraco.cms/businesslogic/Packager/Repositories/RepositoryWebservice.cs @@ -53,7 +53,7 @@ namespace umbraco.cms.businesslogic.packager.repositories /// 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"; } ///