diff --git a/src/js/index.js b/src/js/index.js index 8e200ba10..006b8a4cb 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -341,6 +341,10 @@ var ACTION_BACKUP_FINISH = 'backup.finish'; var ACTION_BACKUP_START = 'backup.start'; var ACTION_BACKUP_CLEANUP = 'backup.cleanup'; var ACTION_CERTIFICATE_RENEWAL = 'certificate.renew'; +var ACTION_DOMAIN_ADD = 'domain.add'; +var ACTION_DOMAIN_UPDATE = 'domain.update'; +var ACTION_DOMAIN_REMOVE = 'domain.remove'; + var ACTION_START = 'cloudron.start'; var ACTION_UPDATE = 'cloudron.update'; var ACTION_USER_ADD = 'user.add'; @@ -414,6 +418,33 @@ app.filter('eventLogDetails', function() { case ACTION_CERTIFICATE_RENEWAL: return 'Certificate renewal for ' + data.domain + (errorMessage ? ' failed' : ' succeeded'); + case ACTION_DOMAIN_ADD: + return 'Domain ' + data.domain + ' with ' + data.provider + ' provider was added'; + + case ACTION_DOMAIN_UPDATE: + return 'Domain ' + data.domain + ' with ' + data.provider + ' provider was updated'; + + case ACTION_DOMAIN_REMOVE: + return 'Domain ' + data.domain + ' was removed'; + + case ACTION_MAIL_ENABLED: + return 'Cloudron Mail was enabled for domain ' + data.domain; + + case ACTION_MAIL_DISABLED: + return 'Cloudron Mail was disabled for domain ' + data.domain; + + case ACTION_MAIL_MAILBOX_ADD: + return 'Mailbox with name ' + data.name + ' was added in domain ' + data.domain; + + case ACTION_MAIL_MAILBOX_REMOVE: + return 'Mailbox with name ' + data.name + ' was removed in domain ' + data.domain; + + case ACTION_MAIL_LIST_ADD: + return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain; + + case ACTION_MAIL_LIST_REMOVE: + return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain; + case ACTION_START: return 'Cloudron started with version ' + data.version; @@ -435,24 +466,6 @@ app.filter('eventLogDetails', function() { case ACTION_USER_LOGIN: return (data.user ? (data.user.email + (data.user.username ? ' (' + data.user.username + ')' : '')) : data.userId) + ' logged in'; - case ACTION_MAIL_ENABLED: - return 'Cloudron Mail was enabled for domain ' + data.domain; - - case ACTION_MAIL_DISABLED: - return 'Cloudron Mail was disabled for domain ' + data.domain; - - case ACTION_MAIL_MAILBOX_ADD: - return 'Mailbox with name ' + data.name + ' was added in domain ' + data.domain; - - case ACTION_MAIL_MAILBOX_REMOVE: - return 'Mailbox with name ' + data.name + ' was removed in domain ' + data.domain; - - case ACTION_MAIL_LIST_ADD: - return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain; - - case ACTION_MAIL_LIST_REMOVE: - return 'Mail list with name ' + data.name + ' was added in domain ' + data.domain; - default: return eventLog.action; } }; @@ -477,18 +490,21 @@ app.filter('eventLogAction', function() { case ACTION_BACKUP_FINISH: return 'Backup finished'; case ACTION_BACKUP_CLEANUP: return 'Backup removed'; case ACTION_CERTIFICATE_RENEWAL: return 'Certificate renewal'; - case ACTION_START: return 'Cloudron started'; - case ACTION_UPDATE: return 'Platform updated'; - case ACTION_USER_ADD: return 'User added'; - case ACTION_USER_LOGIN: return 'User login'; - case ACTION_USER_REMOVE: return 'User removed'; - case ACTION_USER_UPDATE: return 'User updated'; + case ACTION_DOMAIN_ADD: return 'Domain added'; + case ACTION_DOMAIN_UPDATE: return 'Domain updated'; + case ACTION_DOMAIN_REMOVE: return 'Domain removed'; case ACTION_MAIL_ENABLED: return 'Mail enabled'; case ACTION_MAIL_DISABLED: return 'Mail disabled'; case ACTION_MAIL_MAILBOX_ADD: return 'Mailbox added'; case ACTION_MAIL_MAILBOX_REMOVE: return 'Mailbox removed'; case ACTION_MAIL_LIST_ADD: return 'Mail list added'; case ACTION_MAIL_LIST_REMOVE: return 'Mail list removed'; + case ACTION_START: return 'Cloudron started'; + case ACTION_UPDATE: return 'Platform updated'; + case ACTION_USER_ADD: return 'User added'; + case ACTION_USER_LOGIN: return 'User login'; + case ACTION_USER_REMOVE: return 'User removed'; + case ACTION_USER_UPDATE: return 'User updated'; default: return eventLog.action; } }; diff --git a/src/views/activity.js b/src/views/activity.js index 80620fa1f..547a7a9fd 100644 --- a/src/views/activity.js +++ b/src/views/activity.js @@ -27,6 +27,9 @@ angular.module('Application').controller('ActivityController', ['$scope', '$loca { name: 'cloudron.activate', value: 'cloudron.activate' }, { name: 'cloudron.start', value: 'cloudron.start' }, { name: 'cloudron.update', value: 'cloudron.update' }, + { name: 'domain.add', value: 'domain.add' }, + { name: 'domain.update', value: 'domain.update' }, + { name: 'domain.remove', value: 'domain.remove' }, { name: 'mail.enabled', value: 'mail.enabled' }, { name: 'mail.box.add', value: 'mail.box.add' }, { name: 'mail.box.remove', value: 'mail.box.remove' },