Merge pull request #48 from abjerner/umbraco8

(WIP) Support for Umbraco 8
skybrud · Jun 3, 2019 · 7f86807 · 7f86807
2 parents e87db0c + 006b3f0
commit 7f86807
Show file tree

Hide file tree

Showing 44 changed files with 1,178 additions and 1,163 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/package.json b/package.json
diff --git a/releases/nuget/Skybrud.Umbraco.Redirects.2.0.0-alpha001.nupkg b/releases/nuget/Skybrud.Umbraco.Redirects.2.0.0-alpha001.nupkg
diff --git a/src/Skybrud.Umbraco.Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Lang/da-DK.xml b/src/Skybrud.Umbraco.Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Lang/da-DK.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <language alias="da" intName="Danish" localName="dansk" lcid="6" culture="da-DK">
+  <area alias="dashboardTabs">
+    <key alias="Skybrud.Umbraco.Redirects">Redirects</key>
+  </area>
   <area alias="redirects">
     <key alias="redirects">Redirects</key>
     <key alias="addNewRedirect">Tilføj nyt redirect</key>

diff --git a/src/Skybrud.Umbraco.Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Lang/en-GB.xml b/src/Skybrud.Umbraco.Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Lang/en-GB.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <language alias="en" intName="English (UK)" localName="English (UK)" lcid="" culture="en-GB">
+  <area alias="dashboardTabs">
+    <key alias="Skybrud.Umbraco.Redirects">Redirects</key>
+  </area>
   <area alias="redirects">
     <key alias="redirects">Redirects</key>
     <key alias="addNewRedirect">Add new redirect</key>

diff --git a/src/Skybrud.Umbraco.Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Lang/en-US.xml b/src/Skybrud.Umbraco.Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Lang/en-US.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 
 <language alias="en" intName="English (US)" localName="English (US)" lcid="" culture="en-US">
+  <area alias="dashboardTabs">
+    <key alias="Skybrud.Umbraco.Redirects">Redirects</key>
+  </area>
   <area alias="redirects">
     <key alias="redirects">Redirects</key>
     <key alias="addNewRedirect">Add new redirect</key>

diff --git a/...Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Scripts/Controllers/Dashboards/Default.js b/...Redirects/App_Plugins/Skybrud.Umbraco.Redirects/Scripts/Controllers/Dashboards/Default.js
@@ -1,4 +1,4 @@
-angular.module('umbraco').controller('SkybrudUmbracoRedirects.Dashboard.Controller', function ($scope, $http, $q, $timeout, dialogService, notificationsService, localizationService, skybrudRedirectsService) {
+angular.module('umbraco').controller('SkybrudUmbracoRedirects.Dashboard.Controller', function ($scope, $http, $q, $timeout, editorService, notificationsService, localizationService, skybrudRedirectsService) {
 
     $scope.redirects = [];
     $scope.mode = 'list';
@@ -61,7 +61,7 @@
 
     // Initial pagination options
     $scope.pagination = {
-        text: '',
+        text: "",
         page: 1,
         pages: 0,
         limit: 11,
@@ -161,8 +161,8 @@
 
     };
 
-    skybrudRedirectsService.getRootNodes().success(function (r) {
-        angular.forEach(r.data, function (rootNode) {
+    skybrudRedirectsService.getRootNodes().then(function (r) {
+        angular.forEach(r.data.items, function (rootNode) {
             $scope.rootNodes.push(rootNode);
         });
     });