jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Allow deeplinking of domains into email view

Browse Source
This commit is contained in:
Johannes Zellner
2018-04-09 18:00:08 +02:00
parent 9acde7fe86
commit 8565130166
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dashboard/src/js/index.js
View File

@@ -74,6 +74,9 @@ app.config(['$routeProvider', function ($routeProvider) {
}).when('/email', {
controller: 'EmailController',
templateUrl: 'views/email.html?<%= revision %>'
}).when('/email/:domain', {
controller: 'EmailController',
templateUrl: 'views/email.html?<%= revision %>'
}).when('/settings', {
controller: 'SettingsController',
templateUrl: 'views/settings.html?<%= revision %>'

2
dashboard/src/views/email.html
View File

@@ -231,7 +231,7 @@
<div class="text-left">
<h1>
Email
<select class="form-control pull-right" style="display: inline-block; width: 200px;" ng-model="selectedDomain" ng-options="a.domain for a in domains" ng-change="refreshDomain()"></select>
<select class="form-control pull-right" style="display: inline-block; width: 200px;" ng-model="selectedDomain" ng-options="a.domain for a in domains" ng-change="selectDomain()"></select>
</h1>
</div>

35
dashboard/src/views/email.js
View File

@@ -474,6 +474,10 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
}
}
$scope.selectDomain = function () {
$location.path('/email/' + $scope.selectedDomain.domain, false);
};
$scope.refreshDomain = function () {
$scope.refreshBusy = true;
@@ -556,6 +560,8 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
};
Client.onReady(function () {
var domain = $location.path().slice('/email/'.length);
Client.getUsers(function (error, users) {
if (error) return console.error('Unable to get user listing.', error);
@@ -569,14 +575,39 @@ angular.module('Application').controller('EmailController', ['$scope', '$locatio
if (error) return console.error('Unable to get domain listing.', error);
$scope.domains = domains;
$scope.selectedDomain = $scope.domains[0];
$scope.selectedDomain = domains.find(function (d) { return d.domain === domain; });
$scope.refreshDomain();
if (!$scope.selectedDomain) {
$location.path('/email/' + domains[0].domain, false);
} else {
$scope.refreshDomain();
}
$scope.ready = true;
});
});
});
function hashChangeListener() {
if (!$scope.ready) return;
// event listener is called from DOM not angular, need to use $apply
$scope.$apply(function () {
var domain = $location.path().slice('/email/'.length);
$scope.selectedDomain = $scope.domains.find(function (d) { return d.domain === domain; });
if (!$scope.selectedDomain) {
$location.path('/email/' + $scope.domains[0].domain, false);
} else {
$scope.refreshDomain();
}
});
}
window.addEventListener('hashchange', hashChangeListener);
$scope.$on('$destroy', function handler() {
window.removeEventListener('hashchange', hashChangeListener);
});
// setup all the dialog focus handling