diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Browser.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Browser.Controller.js index 54c3752..87bf310 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Browser.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Browser.Controller.js @@ -5,7 +5,7 @@ app.requires.push('tableSort'); app.controller("Analytics.BrowserController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -13,7 +13,6 @@ app.controller("Analytics.BrowserController", $scope.items = []; $scope.itemSpecs = []; - $scope.loadingViews = true; $scope.dateFilter = settingsResource.getDateFilter(); @@ -121,4 +120,6 @@ app.controller("Analytics.BrowserController", } }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Country.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Country.Controller.js index fb7d462..fb8e9e1 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Country.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Country.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.CountryController", - function ($scope, $location, statsResource, settingsResource, assetsService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, assetsService, navigationService) { var profileID = ""; @@ -68,4 +68,6 @@ }); }); }; + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Device.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Device.Controller.js index dfe30f2..2648605 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Device.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Device.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.DeviceController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -114,4 +114,6 @@ }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Ecommerce.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Ecommerce.Controller.js index d629f79..59edc47 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Ecommerce.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Ecommerce.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.EcommerceController", - function ($scope, $location, statsResource, settingsResource) { + function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) { var profileID = ""; @@ -94,4 +94,6 @@ }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js index 5d4d2c9..c61bd19 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Keyword.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.KeywordController", - function ($scope, $location, statsResource, settingsResource) { + function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) { var profileID = ""; @@ -43,4 +43,6 @@ }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Language.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Language.Controller.js index 6eb1dfc..9126729 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Language.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Language.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.LanguageController", - function ($scope, $location, statsResource, settingsResource) { + function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) { var profileID = ""; @@ -41,4 +41,6 @@ }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/OS.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/OS.Controller.js index 8249f86..9834966 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/OS.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/OS.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.OSController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -113,4 +113,6 @@ }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js index e0c0a94..96fe5ea 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/PageViews.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.PageViewsController", - function ($scope, $location, statsResource, settingsResource, dateRangeService, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, dateRangeService, localizationService, navigationService) { var profileID = ""; @@ -114,4 +114,6 @@ }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ProductPerformance.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ProductPerformance.Controller.js index 044c0c5..1847f54 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ProductPerformance.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ProductPerformance.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.ProductPerformanceController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -96,4 +96,7 @@ }); }); + + // todo: possible to find "ecommerce" alias dynamic? "ecommerce" is parent tree alias + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", "ecommerce", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/SalesPerformance.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/SalesPerformance.Controller.js index e5d2140..c9251a0 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/SalesPerformance.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/SalesPerformance.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.SalesPerformanceController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -96,4 +96,7 @@ }); }); + + // todo: possible to find "ecommerce" alias dynamic? "ecommerce" is parent tree alias + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", "ecommerce", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ScreenRes.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ScreenRes.Controller.js index a90e5e1..b273d38 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ScreenRes.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/ScreenRes.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.ScreenResController", - function ($scope, $location, statsResource, settingsResource) { + function ($scope, $location, $routeParams, statsResource, settingsResource, navigationService) { var profileID = ""; @@ -40,4 +40,6 @@ }); }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Settings.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Settings.Controller.js index 0c3064c..364436e 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Settings.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Settings.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.SettingsController", - function ($scope, settingsResource, notificationsService, localizationService, navigationService) { + function ($scope, $routeParams, settingsResource, notificationsService, localizationService, navigationService) { //By default user has not authorised var hasUserAuthd = false; @@ -43,8 +43,7 @@ //Only load/fetch if showAuth is true if (hasUserAuthd === true) { - - console.log("get accounts"); + //Get all accounts via settingsResource - does WebAPI GET call settingsResource.getaccounts().then(function (response) { $scope.accounts = response.data; @@ -64,7 +63,6 @@ //When an account is selected $scope.accountSelected = function (selectedAccount) { - console.log(selectedAccount); settingsResource.getprofiles(selectedAccount.Id).then(function (response) { $scope.profiles = response.data; @@ -109,9 +107,10 @@ notificationsService.success(localizationService.localize("analytics_profileDetailsSaved")); //Sync ('refresh') the tree! - navigationService.syncTree({ tree: 'analyticsTree', path: [-1, -1], forceReload: true, activate: true }); + navigationService.syncTree({ tree: 'analyticsTree', path: [-1, $routeParams.id], forceReload: true, activate: true }); }); }; + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Social.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Social.Controller.js index c31051c..0d3cd3c 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Social.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Social.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.SocialController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -92,4 +92,6 @@ }); }); }); + + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Transaction.Controller.js b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Transaction.Controller.js index a21100b..8c86b52 100644 --- a/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Transaction.Controller.js +++ b/Analytics/App_Plugins/Analytics/backOffice/AnalyticsTree/controllers/Transaction.Controller.js @@ -1,5 +1,5 @@ angular.module("umbraco").controller("Analytics.TransactionController", - function ($scope, $location, statsResource, settingsResource, localizationService) { + function ($scope, $location, $routeParams, statsResource, settingsResource, localizationService, navigationService) { var profileID = ""; @@ -93,4 +93,7 @@ }); }); + + // todo: possible to find "ecommerce" alias dynamic? "ecommerce" is parent tree alias + navigationService.syncTree({ tree: 'analyticsTree', path: ["-1", "ecommerce", $routeParams.id], forceReload: false }); }); \ No newline at end of file diff --git a/BuildPackage/Tools/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll b/BuildPackage/Tools/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll deleted file mode 100644 index 77bafe8..0000000 Binary files a/BuildPackage/Tools/MSBuildCommunityTasks/ICSharpCode.SharpZipLib.dll and /dev/null differ diff --git a/BuildPackage/Tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll b/BuildPackage/Tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll deleted file mode 100644 index cf847a5..0000000 Binary files a/BuildPackage/Tools/MSBuildCommunityTasks/MSBuild.Community.Tasks.dll and /dev/null differ diff --git a/BuildPackage/Tools/MSBuildNugetTasks/MSBuild.NuGet.Tasks.dll b/BuildPackage/Tools/MSBuildNugetTasks/MSBuild.NuGet.Tasks.dll deleted file mode 100644 index d7bc3f3..0000000 Binary files a/BuildPackage/Tools/MSBuildNugetTasks/MSBuild.NuGet.Tasks.dll and /dev/null differ diff --git a/BuildPackage/Tools/MSBuildUmbracoTasks/ICSharpCode.SharpZipLib.dll b/BuildPackage/Tools/MSBuildUmbracoTasks/ICSharpCode.SharpZipLib.dll deleted file mode 100644 index 77bafe8..0000000 Binary files a/BuildPackage/Tools/MSBuildUmbracoTasks/ICSharpCode.SharpZipLib.dll and /dev/null differ diff --git a/BuildPackage/Tools/MSBuildUmbracoTasks/MSBuild.Umbraco.Tasks.dll b/BuildPackage/Tools/MSBuildUmbracoTasks/MSBuild.Umbraco.Tasks.dll deleted file mode 100644 index cb05f27..0000000 Binary files a/BuildPackage/Tools/MSBuildUmbracoTasks/MSBuild.Umbraco.Tasks.dll and /dev/null differ diff --git a/BuildPackage/Tools/NuGet.exe b/BuildPackage/Tools/NuGet.exe deleted file mode 100644 index 3ffdd33..0000000 Binary files a/BuildPackage/Tools/NuGet.exe and /dev/null differ diff --git a/appveyor.yml b/appveyor.yml index b8cb514..ba532bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,27 +1,19 @@ -# version format -version: 1.1.0.{build} - -# UMBRACO_PACKAGE_PRERELEASE_SUFFIX will only be used for Release builds -# example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta -install: - - cmd: set UMBRACO_PACKAGE_PRERELEASE_SUFFIX= - - cmd: cd BuildPackage - - cmd: Build.bat - -# to disable automatic builds and use our build.bat file with MSBUILD above -build: off - -artifacts: - - path: BuildPackage\artifacts\*.nupkg - - path: BuildPackage\artifacts\*.zip - +version: 1.1.0 +assembly_info: + patch: true + file: '**\AssemblyInfo.*' + assembly_version: '{version}' + assembly_file_version: '{version}' + assembly_informational_version: '{version}' +nuget: + project_feed: true +before_build: +- nuget restore +build: + publish_nuget: true + publish_nuget_symbols: true + verbosity: normal deploy: -- provider: NuGet - api_key: - secure: ouE7tpDB4dawEEQ0ig0uqq2dNEB7J6iDJ7smAPzhlKC/x/p23Txr5MRDqaIQzjYH - on: - branch: develop - - provider: NuGet api_key: secure: ouE7tpDB4dawEEQ0ig0uqq2dNEB7J6iDJ7smAPzhlKC/x/p23Txr5MRDqaIQzjYH