Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.controller.js =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.controller.js (revision 9231) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.controller.js (working copy) @@ -6,338 +6,15 @@ '$state', '$uibModal', 'sysResourceService', - '$filter', - function($scope, $rootScope, $state, $uibModal, sysResourceService, $filter) { + function($scope, $rootScope, $state, $uibModal, sysResourceService) { var avxViewModel = this; $rootScope.title = "System Email Settings"; - $scope.onLabel = $filter('T')('Enable'); - $scope.offLabel = $filter('T')('Disable'); - - avxViewModel.email = { - from_string: '' - }; - avxViewModel.emailPlaceholder = ''; - avxViewModel.originalFromString = ''; - avxViewModel.alert = { - hostname: '', - send_alert: false - }; - avxViewModel.alertHostnamePlaceholder = ''; - avxViewModel.externalServer = { - enable: false, - email_server: '', - server_port: 25, - use_ssl_tls: false - }; - avxViewModel.externalSender = { - email: '', - password: '' - }; - avxViewModel.showPassword = false; - avxViewModel.relay = { - enable: false - }; - avxViewModel.relay_data = []; - - // Form validation function - avxViewModel.isFormInvalid = function(form, fromString) { - return form.$invalid || - form.from_string.$error.email || - form.from_string.$error.maxlength || - (fromString && fromString.length > 64); - }; - - // External sender form validation function - avxViewModel.isExternalSenderFormInvalid = function(form, email) { - var password = avxViewModel.externalSender.password; - return form.$invalid || - form.external_sender_email.$error.email || - form.external_sender_email.$error.maxlength || - (email && email.length > 32) || - !password || // Password required - password.length === 0 || - (password && password.length > 64); // Password length check - }; - - // Hostname validation function - avxViewModel.isValidHostname = function(hostname) { - if (!hostname) return true; // Empty is valid - - // IP address regex (IPv4) - var ipRegex = /^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/; - - // FQDN regex - var fqdnRegex = /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$/; - - return ipRegex.test(hostname) || fqdnRegex.test(hostname); - }; - - // Alert form validation function - avxViewModel.isAlertFormInvalid = function(form, hostname) { - return (hostname && hostname.length > 128) || - (hostname && !avxViewModel.isValidHostname(hostname)); - }; - - // External server form validation function - avxViewModel.isExternalServerFormInvalid = function(form, emailServer) { - var port = avxViewModel.externalServer.server_port; - var isPortValid = (port === null || port === undefined || port === '' || (port >= 0 && port <= 65535)); - - return !emailServer || // Required field check - emailServer.length === 0 || - (emailServer && emailServer.length > 64) || - (emailServer && !avxViewModel.isValidHostname(emailServer)) || - !isPortValid; // Port validation - allow empty - }; - - // Define showProgressBar function early so it can be used by all functions - var showProgressBar = function() { - var modalInstance = $uibModal.open({ - templateUrl: 'app/modules/common/templates/progress.html', - controller: 'showProgressCtrl', - controllerAs: 'progress', - backdrop: false - }); - return modalInstance; - }; - - // Get relay status on initialization - sysResourceService - .get_relay_status() - .then(function(res) { - if (res && res.status === 200 && res.data[0]) { - avxViewModel.relay.enable = res.data[1].status || false; - } - }) - .catch(function() { - avxViewModel.relay.enable = false; - }); - - avxViewModel.refreshRelayList = function() { - showProgressBar(); - sysResourceService - .get_relay_server_list() - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res && res.status === 200) { - avxViewModel.relay_data = res.data || []; - } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - alert("Failed to load relay server list."); - }); - }; - - avxViewModel.showRelayAddModal = function() { - var modalInstance = $uibModal.open({ - templateUrl: 'app/modules/system/submenu/sys_mgmt/email/relay-add.html', - controller: 'relayAddCtrl', - controllerAs: 'relayAdd' - }); - modalInstance.result.then(function(){ - avxViewModel.refreshRelayList(); - }); - }; - - avxViewModel.deleteRelay = function(row) { - var reminder = $filter('T')('Are you sure you want to delete the relay server for hostname') + ' [' + row.host_name + ']?'; - var action_reminder = confirm(reminder); - - if (!action_reminder) { - return; - } - - showProgressBar(); - sysResourceService - .delete_relay_server(row.host_name) - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res && res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - } else { - avxViewModel.refreshRelayList(); - } - } else { - alert("Internal error."); - } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - alert("Failed to delete relay server."); - }); - }; - - avxViewModel.clearAllRelayServers = function() { - var reminder = $filter('T')('Are you sure you want to clear the relay server configuration?'); - var action_reminder = confirm(reminder); - - if (!action_reminder) { - return; - } - - showProgressBar(); - sysResourceService - .clear_relay_server() - .then(function(res) { - if (res && res.status === 200) { - if (!res.data[0]) { - $rootScope.$broadcast('endLoading', true); - alert(res.data[1]); - } else { - sysResourceService - .get_relay_server_list() - .then(function(listRes) { - if (listRes && listRes.status === 200) { - avxViewModel.relay_data = listRes.data || []; - } - return sysResourceService.get_relay_status(); - }) - .then(function(statusRes) { - $rootScope.$broadcast('endLoading', true); - if (statusRes && statusRes.status === 200 && statusRes.data[0]) { - avxViewModel.relay.enable = statusRes.data[1].status || false; - } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - alert("Failed to refresh relay status."); - }); - } - } else { - $rootScope.$broadcast('endLoading', true); - alert("Internal error."); - } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - alert("Failed to clear relay servers."); - }); - }; - - avxViewModel.toggleRelayEnable = function() { - // Check if relay_data has items before enabling - if (avxViewModel.relay.enable && (!avxViewModel.relay_data || avxViewModel.relay_data.length === 0)) { - avxViewModel.relay.enable = false; - alert($filter('T')('Please complete all required relay server settings before enabling this configuration.')); - return; - } - - showProgressBar(); - sysResourceService - .update_relay_status(avxViewModel.relay.enable) - .then(function(res) { - if (res && res.status === 200 && res.data[0]) { - // Refresh status after successful update - sysResourceService - .get_relay_status() - .then(function(statusRes) { - $rootScope.$broadcast('endLoading', true); - if (statusRes && statusRes.status === 200 && statusRes.data[0]) { - avxViewModel.relay.enable = statusRes.data[1].status || false; - } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - alert("Error occurred while getting relay status."); - }); - } else { - $rootScope.$broadcast('endLoading', true); - alert("Failed to update relay status: " + (res.data[1] || "")); - // Revert the switch state on failure - avxViewModel.relay.enable = !avxViewModel.relay.enable; - } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - alert("Error occurred while updating relay status."); - // Revert the switch state on error - avxViewModel.relay.enable = !avxViewModel.relay.enable; - }); - }; - - avxViewModel.validateExternalServer = function() { - if (avxViewModel.externalServer.enable) { - var emailServer = avxViewModel.externalServer.email_server; - var serverPort = avxViewModel.externalServer.server_port; - - var isEmailServerEmpty = !emailServer || emailServer.trim() === ''; - var isServerPortEmpty = !serverPort || serverPort === ''; - - if (isEmailServerEmpty || isServerPortEmpty) { - alert($filter('T')('Please complete all required external Email server settings before enabling this configuration.')); - avxViewModel.externalServer.enable = false; - return false; - } - - showProgressBar(); - sysResourceService - .update_external_mail_server_status(true) - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res && res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - avxViewModel.externalServer.enable = false; - } - } else { - alert("Internal error."); - avxViewModel.externalServer.enable = false; - } - }); - } else { - showProgressBar(); - sysResourceService - .update_external_mail_server_status(false) - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res && res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - } - } else { - alert("Internal error."); - } - }); - } - }; - function get_info(cb) { sysResourceService .get_email() .then(function(res) { if (res && res.status === 200) { - var fromString = res.data.from_string || ''; - if (fromString && fromString.match(/^%/)) { - avxViewModel.emailPlaceholder = fromString; - avxViewModel.email.from_string = ''; - avxViewModel.originalFromString = ''; - } else { - avxViewModel.email.from_string = fromString; - avxViewModel.emailPlaceholder = ''; - avxViewModel.originalFromString = fromString; - } - } - if(cb) { - cb(); - } - }); - } - function get_alert_info(cb) { - sysResourceService - .get_alert_mail() - .then(function(res) { - if (res && res.status === 200) { - var hostString = res.data.host_string || ''; - if (hostString && hostString.match(/^%/)) { - avxViewModel.alertHostnamePlaceholder = hostString; - avxViewModel.alert.hostname = ''; - } else { - avxViewModel.alert.hostname = hostString; - avxViewModel.alertHostnamePlaceholder = ''; - } - avxViewModel.alert.send_alert = res.data.is_send_alert_msg === true ? true : false; + avxViewModel.email = res.data; } if(cb) { cb(); @@ -345,233 +22,6 @@ }); } get_info(); - get_alert_info(); - - function get_external_mail_info(cb) { - sysResourceService - .get_external_mail_server() - .then(function(res) { - if (res && res.status === 200) { - avxViewModel.externalServer.enable = res.data.status || false; - avxViewModel.externalServer.email_server = res.data.server_address || ''; - avxViewModel.externalServer.server_port = res.data.server_port || 25; - avxViewModel.externalServer.use_ssl_tls = res.data.is_ssl || false; - } - if(cb) { - cb(); - } - }); - } - get_external_mail_info(); - - function get_external_sender_info(cb) { - sysResourceService - .get_external_sender_mail() - .then(function(res) { - if (res && res.status === 200) { - avxViewModel.externalSender.email = res.data.email || ''; - avxViewModel.externalSender.password = res.data.password || ''; - } - if(cb) { - cb(); - } - }); - } - get_external_sender_info(); - avxViewModel.refreshRelayList(); - - avxViewModel.saveEmail = function(from) { - showProgressBar(); - sysResourceService - .update_email(avxViewModel.email.from_string || "") - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - - if (res&&res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - from.$dirty=true; - } else { - from.$dirty=false; - avxViewModel.originalFromString = avxViewModel.email.from_string; - } - } else { - alert("Internal error."); - from.$dirty=true; - } - }) - .catch(function(error) { - $rootScope.$broadcast('endLoading', true); - alert("Internal error."); - from.$dirty=true; - }); - }; - avxViewModel.saveAlert = function(form) { - showProgressBar(); - var post_data = { - host_string: avxViewModel.alert.hostname || "", - is_send_alert_msg: avxViewModel.alert.send_alert || false - }; - sysResourceService - .update_alert_mail(post_data) - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res&&res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - form.$dirty=true; - } else { - form.$dirty=false; - } - } else { - alert("Internal error."); - form.$dirty=true; - } - }); - }; - avxViewModel.saveExternalMailServer = function(form) { - showProgressBar(); - var post_data = { - status: avxViewModel.externalServer.enable || false, - server_address: avxViewModel.externalServer.email_server || "", - server_port: avxViewModel.externalServer.server_port || 25, - is_ssl: avxViewModel.externalServer.use_ssl_tls || false - }; - sysResourceService - .update_external_mail_server(post_data) - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res&&res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - form.$dirty=true; - } else { - form.$dirty=false; - // Refresh external mail server data after successful save - get_external_mail_info(); - } - } else { - alert("Internal error."); - form.$dirty=true; - } - }); - }; - avxViewModel.deleteExternalMailServer = function() { - var reminder = $filter('T')('Are you sure you want to delete the external email server?'); - var action_reminder = confirm(reminder); - - if (!action_reminder) { - return; - } - - showProgressBar(); - sysResourceService - .delete_external_mail_server() - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res && res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - } else { - $state.go('index.system.sys_mgmt.email', {}, {reload: true}); - } - } else { - alert("Internal error."); - } - }); - }; - avxViewModel.saveExternalSender = function(form) { - showProgressBar(); - var post_data = { - email: avxViewModel.externalSender.email || "", - password: avxViewModel.externalSender.password || "" - }; - sysResourceService - .update_external_sender_mail(post_data) - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res&&res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - form.$dirty=true; - } else { - form.$dirty=false; - } - } else { - alert("Internal error."); - form.$dirty=true; - } - }); - }; - avxViewModel.deleteExternalSender = function() { - var reminder = $filter('T')('Are you sure you want to delete the Email?'); - var action_reminder = confirm(reminder); - - if (!action_reminder) { - return; - } - - showProgressBar(); - sysResourceService - .delete_external_sender_mail() - .then(function(res) { - $rootScope.$broadcast('endLoading', true); - if (res && res.status === 200) { - if (!res.data[0]) { - alert(res.data[1]); - } else { - $state.go('index.system.sys_mgmt.email', {}, {reload: true}); - } - } else { - alert("Internal error."); - } - }); - }; - avxViewModel.cancel = function() { - $state.go('index.system.sys_mgmt.email', {}, {reload: true}); - }; - } - ]) - .controller('relayAddCtrl', [ - '$scope', - '$rootScope', - '$state', - '$uibModalInstance', - '$uibModal', - 'sysResourceService', - function($scope, $rootScope, $state, $uibModalInstance, $uibModal, sysResourceService) { - var avxViewModel = this; - avxViewModel.data = { - host_name: '', - relay_server: '' - }; - avxViewModel.loading = false; - - // Hostname validation function (same as main email controller) - avxViewModel.isValidHostname = function(hostname) { - if (!hostname) return true; // Empty is valid - - // IP address regex (IPv4) - var ipRegex = /^(((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/; - - // FQDN regex - var fqdnRegex = /^([a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?\.)*[a-zA-Z0-9]([a-zA-Z0-9\-]{0,61}[a-zA-Z0-9])?$/; - - return ipRegex.test(hostname) || fqdnRegex.test(hostname); - }; - - // Form validation function - avxViewModel.isFormInvalid = function(form, hostname, relayServer) { - return !hostname || // Required field check - !relayServer || // Required field check - hostname.length === 0 || - relayServer.length === 0 || - (hostname && hostname.length > 50) || - (relayServer && relayServer.length > 30) || - (hostname && !avxViewModel.isValidHostname(hostname)) || - (relayServer && !avxViewModel.isValidHostname(relayServer)); - }; - var showProgressBar = function() { var modalInstance = $uibModal.open({ templateUrl: 'app/modules/common/templates/progress.html', @@ -579,50 +29,34 @@ controllerAs: 'progress', backdrop: false }); - return modalInstance; }; - - avxViewModel.modalClose = function() { - $uibModalInstance.dismiss(); - }; - - avxViewModel.add = function(data) { + avxViewModel.saveEmail = function(email, from) { showProgressBar(); - avxViewModel.loading = true; - var post_data = { - host_name: data.host_name || "", - relay_server: data.relay_server || "" - }; + var post_data=email; + if (email === undefined) { + post_data=""; + } sysResourceService - .add_relay_server(post_data) + .update_email(post_data) .then(function(res) { $rootScope.$broadcast('endLoading', true); - avxViewModel.loading = false; - if (res && res.status === 200) { + if (res&&res.status === 200) { if (!res.data[0]) { alert(res.data[1]); + from.$dirty=true; } else { - // Check for warnings even when API call succeeds - if (res.data[2] && Array.isArray(res.data[2])) { - var warnings = res.data[2]; - for (var i = 0; i < warnings.length; i++) { - if (warnings[i][0] === "warning") { - alert(warnings[i][1]); - return; // Don't close modal if there's a warning - } - } + if (email === undefined) { + from.$dirty=false; } - $uibModalInstance.close(); } } else { alert("Internal error."); + from.$dirty=true; } - }) - .catch(function() { - $rootScope.$broadcast('endLoading', true); - avxViewModel.loading = false; - alert("Failed to add relay server."); - }); + }); + }; + avxViewModel.cancel = function() { + $state.go('index.system.sys_mgmt.email', {}, {reload: true}); }; } ]); \ No newline at end of file Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.html =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.html (revision 9231) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/submenu/sys_mgmt/email/email.html (working copy) @@ -1,211 +1,16 @@
-
- - - - -
-
- -
- -

{{'Please enter a valid email address'|T}}

-

{{'Please do not exceed 64 characters'|T}}

-
-
-
-
- - -
-
-
- - -
-
- -
-
- - - - -
-
- -
- -

{{'Please do not exceed 128 characters'|T}}

-

{{'Please enter a valid IP address or FQDN'|T}}

-
-
-
- -
- -
-
-
-
- - -
-
-
- - -
-
- -
-
- - - - -
-
-
- -
-
-
-
-
- -
- -

{{'Please do not exceed 64 characters'|T}}

-

{{'Please enter a valid IP address or hostname'|T}}

-
-
-
- -
- -

{{'Please enter a valid port number (0-65535)'|T}}

-
-
-
- -
- -
-
-
-
- -
-
-
-
- - -
-
-
- - -
-
- -
-
- - - - -
-
- -
- -

{{'Please enter a valid email address'|T}}

-

{{'Please do not exceed 32 characters'|T}}

-
-
-
- -
-
- - - - -
-

{{'Password is required'|T}}

-

{{'Please do not exceed 64 characters'|T}}

-
-
-
-
- - -
-
-
-
- -
-
-
- - -
-
- -
-
- - - - -
-
-
- -
-
-
-
-
-
- - -
-
-
-
-
- - - - - - - - - - - - - - - -
{{'Hostname'|T}}{{'Relay Server'|T}}{{'Action'|T}}
{{row.host_name}}{{row.relay_server}} - -
-
-
-
-
- -
-
- - -
+
+
+ +
+ +
+
+
+
+ + +
+
+
\ No newline at end of file Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/system.service.js =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/system.service.js (revision 9231) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/app/modules/system/system.service.js (working copy) @@ -28,21 +28,6 @@ system_reboot: system_reboot, get_email: get_email, update_email: update_email, - get_alert_mail: get_alert_mail, - update_alert_mail: update_alert_mail, - get_external_mail_server: get_external_mail_server, - update_external_mail_server: update_external_mail_server, - update_external_mail_server_status: update_external_mail_server_status, - delete_external_mail_server: delete_external_mail_server, - get_external_sender_mail: get_external_sender_mail, - update_external_sender_mail: update_external_sender_mail, - delete_external_sender_mail: delete_external_sender_mail, - get_relay_server_list: get_relay_server_list, - add_relay_server: add_relay_server, - delete_relay_server: delete_relay_server, - clear_relay_server: clear_relay_server, - get_relay_status: get_relay_status, - update_relay_status: update_relay_status, get_config_running: get_config_running, get_config_startup: get_config_startup, get_config_tech: get_config_tech, @@ -181,7 +166,7 @@ return apiService.post(url, post_data); } function get_user() { - return apiService.get('/api/avx/system/user_mgmt/Administrator/_get_list_data?key=' + JSON.stringify(['username', 'level', 'passwords']) + '&no_rest=' + JSON.stringify(true)); + return apiService.get('/api/avx/system/user_mgmt/Administrator/_get_list_data'); } function add_user(data) { var url = '/api/avx/system/user_mgmt/Administrator/_add'; @@ -245,78 +230,6 @@ var post_data = {"post_data": JSON.stringify({"from_string":email})}; return apiService.post(url, post_data); } - function get_alert_mail() { - return apiService.get('/api/avx/system/system_mgmt/AlertMail/_fields'); - } - function update_alert_mail(data) { - var url = '/api/avx/system/system_mgmt/AlertMail/_update'; - var post_data = {"post_data": JSON.stringify(data)}; - return apiService.post(url, post_data); - } - function get_external_mail_server() { - return apiService.get('/api/avx/system/system_mgmt/ExternalMailServer/_fields'); - } - function update_external_mail_server(data) { - var url = '/api/avx/system/system_mgmt/ExternalMailServer/_update'; - var post_data = {"post_data": JSON.stringify(data)}; - return apiService.post(url, post_data); - } - function update_external_mail_server_status(value) { - var url = '/api/avx/system/system_mgmt/ExternalMailServer/_perform?action=UpdateStatus'; - var post_data = { - "action": "UpdateStatus", - "options": JSON.stringify({"__pk_list":[], "value": value}) - }; - return apiService.post(url, post_data); - } - function delete_external_mail_server() { - var url = '/api/avx/system/system_mgmt/ExternalMailServer/_perform?action=DeleteServer&options=%7B%22__pk_list%22%3A%5B%5D%7D'; - return apiService.post(url, {}); - } - function get_external_sender_mail() { - return apiService.get('/api/avx/system/system_mgmt/ExternalSenderMail/_fields'); - } - function update_external_sender_mail(data) { - var url = '/api/avx/system/system_mgmt/ExternalSenderMail/_update'; - var post_data = {"post_data": JSON.stringify(data)}; - return apiService.post(url, post_data); - } - function delete_external_sender_mail() { - var url = '/api/avx/system/system_mgmt/ExternalSenderMail/_perform?action=DeleteEmail&options=%7B%22__pk_list%22%3A%5B%5D%7D'; - return apiService.post(url, {}); - } - function get_relay_server_list() { - return apiService.get('/api/avx/system/system_mgmt/RelayServer/_get_list_data'); - } - function add_relay_server(data) { - var url = '/api/avx/system/system_mgmt/RelayServer/_add'; - var post_data = {"post_data": JSON.stringify(data)}; - return apiService.post(url, post_data); - } - function delete_relay_server(hostname) { - var url = '/api/avx/system/system_mgmt/RelayServer/_perform?action=DeleteHost'; - var post_data = { - "action": "DeleteHost", - "options": JSON.stringify({"__pk_list":[], "hostname": hostname}) - }; - return apiService.post(url, post_data); - } - function clear_relay_server() { - var url = '/api/avx/system/system_mgmt/RelayServer/_perform?action=ClearServer&options=%7B%22__pk_list%22%3A%5B%5D%7D'; - return apiService.post(url, {}); - } - function get_relay_status() { - var url = '/api/avx/system/system_mgmt/RelayServer/_perform?action=GetStatus&options=%7B%22__pk_list%22%3A%5B%5D%7D'; - return apiService.post(url, {}); - } - function update_relay_status(value) { - var url = '/api/avx/system/system_mgmt/RelayServer/_perform'; - var post_data = { - "action": "UpdateStatus", - "options": JSON.stringify({"__pk_list":[], "value": value}) - }; - return apiService.post(url, post_data); - } function get_config_running() { return apiService.get('/api/avx/system/config_mgmt/ViewConfig/_fields?fields=[%22running_config%22]'); } Index: /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/index.html =================================================================== --- /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/index.html (revision 9231) +++ /branches/rel_avx_2_7_5/src/webui/webui/htdocs/new/src/client/index.html (working copy) @@ -16,6 +16,6 @@
- +