openstack/horizon
Code Issues Proposed changes

Merge "Dashboard ReOrg - Move cloud-services into app/core"

Browse Source
This commit is contained in:
Jenkins
2015-07-15 20:17:31 +00:00
committed by Gerrit Code Review
parent 4fa3abce3b e3e5ab8345
commit c3efd9a103
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/enabled/_10_project.py
View File

@@ -31,7 +31,6 @@ LAUNCH_INST = 'dashboard/launch-instance/'
ADD_JS_FILES = [ ADD_JS_FILES = [
'dashboard/dashboard.module.js', 'dashboard/dashboard.module.js',
'dashboard/cloud-services/cloud-services.js',
LAUNCH_INST + 'launch-instance.module.js', LAUNCH_INST + 'launch-instance.module.js',
LAUNCH_INST + 'launch-instance-workflow.service.js', LAUNCH_INST + 'launch-instance-workflow.service.js',
LAUNCH_INST + 'launch-instance-modal.controller.js', LAUNCH_INST + 'launch-instance-modal.controller.js',
@@ -57,7 +56,6 @@ ADD_JS_FILES = [
ADD_JS_SPEC_FILES = [ ADD_JS_SPEC_FILES = [
'dashboard/dashboard.module.spec.js', 'dashboard/dashboard.module.spec.js',
'dashboard/cloud-services/cloud-services.spec.js',
LAUNCH_INST + 'launch-instance.module.spec.js', LAUNCH_INST + 'launch-instance.module.spec.js',
LAUNCH_INST + 'launch-instance-workflow.service.spec.js', LAUNCH_INST + 'launch-instance-workflow.service.spec.js',
LAUNCH_INST + 'launch-instance-modal.controller.spec.js', LAUNCH_INST + 'launch-instance-modal.controller.spec.js',

22
openstack_dashboard/static/dashboard/cloud-services/cloud-services.js → openstack_dashboard/static/app/core/cloud-services/cloud-services.js
View File

@@ -20,12 +20,12 @@
var fromJson = angular.fromJson; var fromJson = angular.fromJson;
var isArray = angular.isArray; var isArray = angular.isArray;
angular.module('hz.dashboard') angular.module('horizon.app.core')
/** /**
* @ngdoc factory * @ngdoc factory
* @name hz.dashboard:factory:cloudServices * @name horizon.app.core:factory:cloudServices
* @module hz.dashboard * @module horizon.app.core
* @kind hash table * @kind hash table
* @description * @description
* *
@@ -78,8 +78,8 @@
/** /**
* @ngdoc factory * @ngdoc factory
* @name hz.dashboard:factory:ifFeaturesEnabled * @name horizon.app.core:factory:ifFeaturesEnabled
* @module hz.dashboard * @module horizon.app.core
* @kind function * @kind function
* @description * @description
* *
@@ -111,8 +111,8 @@
/** /**
* @ngdoc factory * @ngdoc factory
* @name hz.dashboard:factory:createDirectiveSpec * @name horizon.app.core:factory:createDirectiveSpec
* @module hz.dashboard * @module horizon.app.core
* @kind function * @kind function
* @description * @description
* *
@@ -160,8 +160,8 @@
/** /**
* @ngdoc directive * @ngdoc directive
* @name hz.dashboard:directive:novaExtension * @name horizon.app.core:directive:novaExtension
* @module hz.dashboard * @module horizon.app.core
* @description * @description
* *
* This is to enable specifying conditional UI in a declarative way. * This is to enable specifying conditional UI in a declarative way.
@@ -204,8 +204,8 @@
/** /**
* @ngdoc directive * @ngdoc directive
* @name hz.dashboard:directive:settingsService * @name horizon.app.core:directive:settingsService
* @module hz.dashboard * @module horizon.app.core
* @description * @description
* *
* This is to enable specifying conditional UI in a declarative way. * This is to enable specifying conditional UI in a declarative way.

12
openstack_dashboard/static/dashboard/cloud-services/cloud-services.spec.js → openstack_dashboard/static/app/core/cloud-services/cloud-services.spec.js
View File

@@ -17,14 +17,14 @@
(function () { (function () {
'use strict'; 'use strict';
describe('hz.dashboard', function () { describe('horizon.app.core', function () {
// factory:cloudServices // factory:cloudServices
describe('factory:cloudServices', function () { describe('factory:cloudServices', function () {
var cloudServices; var cloudServices;
beforeEach(module('hz.dashboard', function ($provide) { beforeEach(module('horizon.app.core', function ($provide) {
$provide.value('horizon.openstack-service-api.cinder', {}); $provide.value('horizon.openstack-service-api.cinder', {});
$provide.value('horizon.openstack-service-api.glance', {}); $provide.value('horizon.openstack-service-api.glance', {});
$provide.value('horizon.openstack-service-api.keystone', {}); $provide.value('horizon.openstack-service-api.keystone', {});
@@ -80,7 +80,7 @@
$q, $q,
cloudServices; cloudServices;
beforeEach(module('hz.dashboard', function ($provide) { beforeEach(module('horizon.app.core', function ($provide) {
$q = { $q = {
all: function () { all: function () {
return { return {
@@ -155,7 +155,7 @@
var createDirectiveSpec, var createDirectiveSpec,
ifFeaturesEnabled; ifFeaturesEnabled;
beforeEach(module('hz.dashboard', function ($provide) { beforeEach(module('horizon.app.core', function ($provide) {
ifFeaturesEnabled = function () { ifFeaturesEnabled = function () {
return { return {
then: function () { then: function () {
@@ -212,7 +212,7 @@
].join(''); ].join('');
var element; var element;
beforeEach(module('hz.dashboard', function ($provide) { beforeEach(module('horizon.app.core', function ($provide) {
$provide.value('ifFeaturesEnabled', function () { $provide.value('ifFeaturesEnabled', function () {
return { return {
then: function (successCallback) { then: function (successCallback) {
@@ -262,7 +262,7 @@
].join(''); ].join('');
var element; var element;
beforeEach(module('hz.dashboard', function ($provide) { beforeEach(module('horizon.app.core', function ($provide) {
$provide.value('ifFeaturesEnabled', function () { $provide.value('ifFeaturesEnabled', function () {
return { return {
then: function (successCallback) { then: function (successCallback) {