From 193756fa6cf119cdc24031434a6ed6cf16b4e909 Mon Sep 17 00:00:00 2001 From: Timur Sufiev Date: Fri, 13 May 2016 17:45:10 +0300 Subject: [PATCH] Add module ngFileUpload as a dependency to main horizon.app module Change-Id: I8ca6379ff6aad32ce934720f234d955dd99204dd --- openstack_dashboard/karma.conf.js | 1 + openstack_dashboard/static/app/app.module.js | 1 + openstack_dashboard/static_settings.py | 4 ++++ openstack_dashboard/templates/horizon/_scripts.html | 1 + requirements.txt | 1 + 5 files changed, 8 insertions(+) diff --git a/openstack_dashboard/karma.conf.js b/openstack_dashboard/karma.conf.js index e6f91df273..861c536b2e 100644 --- a/openstack_dashboard/karma.conf.js +++ b/openstack_dashboard/karma.conf.js @@ -92,6 +92,7 @@ module.exports = function (config) { xstaticPath + 'angular/data/angular-cookies.js', xstaticPath + 'angular_bootstrap/data/angular-bootstrap.js', xstaticPath + 'angular_gettext/data/angular-gettext.js', + xstaticPath + 'angular_fileupload/data/ng-file-upload-all.js', xstaticPath + 'angular/data/angular-sanitize.js', xstaticPath + 'd3/data/d3.js', xstaticPath + 'rickshaw/data/rickshaw.js', diff --git a/openstack_dashboard/static/app/app.module.js b/openstack_dashboard/static/app/app.module.js index 4f7911f826..a02ec4dd30 100644 --- a/openstack_dashboard/static/app/app.module.js +++ b/openstack_dashboard/static/app/app.module.js @@ -27,6 +27,7 @@ 'ngCookies', 'ngSanitize', 'smart-table', + 'ngFileUpload', 'ui.bootstrap' ]; diff --git a/openstack_dashboard/static_settings.py b/openstack_dashboard/static_settings.py index 6d88c13b89..b726ef44bc 100644 --- a/openstack_dashboard/static_settings.py +++ b/openstack_dashboard/static_settings.py @@ -22,6 +22,7 @@ import os import xstatic.main import xstatic.pkg.angular import xstatic.pkg.angular_bootstrap +import xstatic.pkg.angular_fileupload import xstatic.pkg.angular_gettext import xstatic.pkg.angular_lrdragndrop import xstatic.pkg.angular_smart_table @@ -55,6 +56,9 @@ def get_staticfiles_dirs(webroot='/'): ('horizon/lib/angular', xstatic.main.XStatic(xstatic.pkg.angular_bootstrap, root_url=webroot).base_dir), + ('horizon/lib/angular', + xstatic.main.XStatic(xstatic.pkg.angular_fileupload, + root_url=webroot).base_dir), ('horizon/lib/angular', xstatic.main.XStatic(xstatic.pkg.angular_gettext, root_url=webroot).base_dir), diff --git a/openstack_dashboard/templates/horizon/_scripts.html b/openstack_dashboard/templates/horizon/_scripts.html index 03b77b5291..b89115e43b 100644 --- a/openstack_dashboard/templates/horizon/_scripts.html +++ b/openstack_dashboard/templates/horizon/_scripts.html @@ -16,6 +16,7 @@ + diff --git a/requirements.txt b/requirements.txt index e389d005df..eac469cd0e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,6 +39,7 @@ six>=1.9.0 # MIT XStatic>=1.0.0 # MIT License XStatic-Angular>=1.3.7 # MIT License XStatic-Angular-Bootstrap>=0.11.0.2 # MIT License +XStatic-Angular-FileUpload>=12.0.4.0 # MIT License XStatic-Angular-Gettext>=2.1.0.2 # MIT License XStatic-Angular-lrdragndrop>=1.0.2.2 # MIT License XStatic-Bootstrap-Datepicker>=1.3.1.0 # Apache 2.0 License