openstack/ironic-ui
Code Issues Proposed changes

Merge "Eliminate use of a now obsolete admin basePath variable"

Browse Source
This commit is contained in:
Jenkins 2016-11-02 11:45:17 +00:00 committed by Gerrit Code Review
commit 143222d3bf
7 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic_ui/static/dashboard/admin/ironic/create-port/create-port.service.js
View File

@ -23,7 +23,7 @@
createPortService.$inject = [
'$modal',
'horizon.dashboard.admin.basePath'
'horizon.dashboard.admin.ironic.basePath'
];
function createPortService($modal, basePath) {
@ -41,7 +41,7 @@
return node;
}
},
templateUrl: basePath + '/ironic/create-port/create-port.html'
templateUrl: basePath + '/create-port/create-port.html'
};
return $modal.open(options);
}

4
ironic_ui/static/dashboard/admin/ironic/edit-node/edit-node.service.js
View File

@ -23,7 +23,7 @@
editNodeService.$inject = [
'$modal',
'horizon.dashboard.admin.basePath',
'horizon.dashboard.admin.ironic.basePath',
'$log'
];
@ -42,7 +42,7 @@
return node;
}
},
templateUrl: basePath + '/ironic/base-node/base-node.html'
templateUrl: basePath + '/base-node/base-node.html'
};
return $modal.open(options);
}

4
ironic_ui/static/dashboard/admin/ironic/enroll-node/enroll-node.service.js
View File

@ -23,7 +23,7 @@
enrollNodeService.$inject = [
'$modal',
'horizon.dashboard.admin.basePath'
'horizon.dashboard.admin.ironic.basePath'
];
function enrollNodeService($modal, basePath) {
@ -35,7 +35,7 @@
var options = {
controller: 'EnrollNodeController as ctrl',
backdrop: 'static',
templateUrl: basePath + '/ironic/base-node/base-node.html'
templateUrl: basePath + '/base-node/base-node.html'
};
return $modal.open(options);
}

22
ironic_ui/static/dashboard/admin/ironic/ironic.module.js
View File

@ -27,21 +27,27 @@
*/
angular
.module('horizon.dashboard.admin.ironic', [])
.constant('horizon.dashboard.admin.ironic.validHostNamePattern',
'^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$') // eslint-disable-line max-len
.config(config);
.constant('horizon.dashboard.admin.ironic.validUuidPattern',
'^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$') // eslint-disable-line max-len
.constant('horizon.dashboard.admin.ironic.events', events());
config.$inject = ['$provide', '$windowProvider'];
function events() {
return {
function config($provide, $windowProvider) {
$provide.constant('horizon.dashboard.admin.ironic.validHostNamePattern',
'^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]*[a-zA-Z0-9])\\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\\-]*[A-Za-z0-9])$'); // eslint-disable-line max-len
$provide.constant('horizon.dashboard.admin.ironic.validUuidPattern',
'^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$'); // eslint-disable-line max-len
var path = $windowProvider.$get().STATIC_URL + 'dashboard/admin/ironic/';
$provide.constant('horizon.dashboard.admin.ironic.basePath', path);
var events = {
ENROLL_NODE_SUCCESS:'horizon.dashboard.admin.ironic.ENROLL_NODE_SUCCESS',
DELETE_NODE_SUCCESS:'horizon.dashboard.admin.ironic.DELETE_NODE_SUCCESS',
EDIT_NODE_SUCCESS:'horizon.dashboard.admin.ironic.EDIT_NODE_SUCCESS',
CREATE_PORT_SUCCESS:'horizon.dashboard.admin.ironic.CREATE_PORT_SUCCESS',
DELETE_PORT_SUCCESS:'horizon.dashboard.admin.ironic.DELETE_PORT_SUCCESS'
};
$provide.constant('horizon.dashboard.admin.ironic.events', events);
}
})();

6
ironic_ui/static/dashboard/admin/ironic/maintenance/maintenance.service.js
View File

@ -30,7 +30,7 @@
maintenanceService.$inject = [
'$modal',
'horizon.dashboard.admin.basePath',
'horizon.dashboard.admin.ironic.basePath',
'horizon.dashboard.admin.ironic.actions'
];
@ -54,7 +54,7 @@
function putNodeInMaintenanceMode(node) {
var options = {
controller: "MaintenanceController as ctrl",
templateUrl: basePath + '/ironic/maintenance/maintenance.html'
templateUrl: basePath + '/maintenance/maintenance.html'
};
$modal.open(options).result.then(function(maintReason) {
actions.putNodeInMaintenanceMode(node, maintReason);
@ -72,7 +72,7 @@
function putNodesInMaintenanceMode(nodes) {
var options = {
controller: "MaintenanceController as ctrl",
templateUrl: basePath + '/ironic/maintenance/maintenance.html'
templateUrl: basePath + '/maintenance/maintenance.html'
};
$modal.open(options).result.then(function(maintReason) {
actions.putAllInMaintenanceMode(nodes, maintReason);

4
ironic_ui/static/dashboard/admin/ironic/node-details/node-details.controller.js
View File

@ -30,7 +30,7 @@
'horizon.app.core.openstack-service-api.ironic',
'horizon.dashboard.admin.ironic.events',
'horizon.dashboard.admin.ironic.actions',
'horizon.dashboard.admin.basePath',
'horizon.dashboard.admin.ironic.basePath',
'horizon.dashboard.admin.ironic.edit-node.service',
'horizon.dashboard.admin.ironic.maintenance.service',
'horizon.dashboard.admin.ironic.validUuidPattern'
@ -48,7 +48,7 @@
maintenanceService,
validUuidPattern) {
var ctrl = this;
var path = basePath + 'ironic/node-details/sections/';
var path = basePath + '/node-details/sections/';
ctrl.noPortsText = gettext('No network ports have been defined');

3
ironic_ui/static/dashboard/admin/ironic/node-list/node-list.controller.js
View File

@ -29,7 +29,6 @@
'horizon.app.core.openstack-service-api.ironic',
'horizon.dashboard.admin.ironic.events',
'horizon.dashboard.admin.ironic.actions',
'horizon.dashboard.admin.basePath',
'horizon.dashboard.admin.ironic.maintenance.service',
'horizon.dashboard.admin.ironic.enroll-node.service',
'horizon.dashboard.admin.ironic.edit-node.service'
@ -42,7 +41,6 @@
ironic,
ironicEvents,
actions,
basePath,
maintenanceService,
enrollNodeService,
editNodeService) {
@ -50,7 +48,6 @@
ctrl.nodes = [];
ctrl.nodesSrc = [];
ctrl.basePath = basePath;
ctrl.actions = actions;
ctrl.putNodeInMaintenanceMode = putNodeInMaintenanceMode;