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

Merge pull request #281 from Jeavon/U4-3987

Browse Source 
Fixes U4-3987- Related Links
This commit is contained in:
Shandem
2014-01-07 15:47:16 -08:00
parent b3151ca788 13641473d0
commit 326d81286a
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
View File

@@ -39,10 +39,8 @@
$scope.model.value[idx].edit = false;
};
$scope.delete = function (idx) {
$scope.model.value.splice(idx, 1);
$scope.delete = function (idx) {
$scope.model.value.splice(idx, 1);
};
$scope.add = function () {
@@ -68,7 +66,7 @@
this.internal = $scope.newInternal;
this.edit = false;
this.isInternal = true;
this.iternalName = $scope.newInternalName;
this.internalName = $scope.newInternalName;
this.type = "internal";
this.title = $scope.newCaption;
};
@@ -88,8 +86,11 @@
$event.preventDefault();
};
$scope.switchLinkType = function ($event,link) {
link.isInternal = !link.isInternal;
$scope.switchLinkType = function ($event, link) {
link.isInternal = !link.isInternal;
link.type = link.isInternal ? "internal" : "external";
if (!link.isInternal)
link.link = $scope.newLink;
$event.preventDefault();
};
@@ -97,12 +98,10 @@
if ($scope.currentEditLink != null) {
$scope.currentEditLink.internal = data.id;
$scope.currentEditLink.internalName = data.name;
$scope.currentEditLink.link = data.id;
} else {
$scope.newInternal = data.id;
$scope.newInternalName = data.name;
}
}
}
});

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.html
View File

@@ -17,7 +17,7 @@
<td style="word-wrap:break-word; word-break: break-all">
<div ng-show="!link.edit">
<a href="{{link.link}}" target="_blank" ng-show="!link.isInternal">{{link.link}}</a>
<a href="#/content/content/edit/{{link.internal}}" target="_blank" ng-show="link.isInternal" ng-bind="link.iternalName">
<a href="#/content/content/edit/{{link.internal}}" target="_blank" ng-show="link.isInternal" ng-bind="link.internalName">
</a>
</div>