Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change upgrade URL to extension manifest URL instead of the upgrade service redirect #3834

Merged
merged 5 commits into from
Jun 11, 2020
Merged

Change upgrade URL to extension manifest URL instead of the upgrade service redirect #3834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09545b1
Change upgrade URL to extension manifest URL instead of the upgrade s…
david-poindexter Jun 11, 2020
ca29f8c
Merge branch 'develop' into issue-3823
david-poindexter Jun 11, 2020
925d6fc
Add back in the version image from the Update Service
david-poindexter Jun 11, 2020
b277420
Merge branch 'issue-3823' of https://github.com/david-poindexter/Dnn.…
david-poindexter Jun 11, 2020
c1955b1
Add back in the version image from the Update Service
david-poindexter Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...xtensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ class ExtensionDetailRow extends Component {
{this.getInUseDisplay(props._package.friendlyName, props._package.packageId)}
</GridCell>
<GridCell columnSize={ColumnSizes[4]}>
<a href={props._package.upgradeUrl} target="_blank" rel="noopener noreferrer" aria-label="Update">
<img src={props._package.upgradeIndicator} alt="Update"/>
<a href={props._package.url} target="_blank" rel="noopener noreferrer" aria-label="Update">
<img src={props._package.upgradeIndicator} alt="Update" />
</a>
</GridCell>
<GridCell columnSize={ColumnSizes[5]} style={{ paddingRight: 0 }}>
Expand Down
2 changes: 1 addition & 1 deletion ...tensions.Web/src/components/Body/InstalledExtensions/common/ExtensionDetailRow/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
font-weight: bold;
margin-bottom: 3px;
}
.in-use{
.in-use {
color: @curiousBlue;
cursor: pointer;
}
Expand Down
12 changes: 8 additions & 4 deletions ...AdminExperience/Dnn.PersonaBar.Extensions/Components/Extensions/Dto/PackageInfoSlimDto.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information

#region Usings

using DotNetNuke.Common.Utilities;
Expand Down Expand Up @@ -47,6 +47,9 @@ public class PackageInfoSlimDto
[JsonProperty("packageIcon")]
public string PackageIcon { get; set; }

[JsonProperty("url")]
public string Url { get; set; }

[JsonProperty("canDelete")]
public bool CanDelete { get; set; }

Expand All @@ -70,6 +73,7 @@ public PackageInfoSlimDto(int portalId, PackageInfo package)
this.UpgradeUrl = ExtensionsController.UpgradeRedirect(package.Version, package.PackageType, package.Name);
this.UpgradeIndicator = ExtensionsController.UpgradeIndicator(package.Version, package.PackageType, package.Name);
this.PackageIcon = ExtensionsController.GetPackageIcon(package);
this.Url = package.Url;
this.CanDelete = package.PackageID != Null.NullInteger && !package.IsSystemPackage && PackageController.CanDeletePackage(package, PortalSettings.Current);

if (package.PackageID != Null.NullInteger)
Expand Down