components/openstack/horizon/patches/02-change-angular-imports.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 6016 a477397bba8b
child 6054 b5ae16fb8526
equal deleted inserted replaced
6016:a477397bba8b 6035:c9748fcc32de
     1 In-house patch to change how angularjs is imported.  In
       
     2 XStatic-Angular-1.3.7.0, angular_cookies and angular_mock were rolled
       
     3 into the angular pacakge.
       
     4 
       
     5 --- horizon-2014.2.1/openstack_dashboard/settings.py.orig	2015-01-15 19:27:56.738322606 -0700
       
     6 +++ horizon-2014.2.1/openstack_dashboard/settings.py	2015-01-15 19:28:26.944716700 -0700
       
     7 @@ -24,8 +24,6 @@ import warnings
       
     8  from django.utils.translation import ugettext_lazy as _
       
     9  import xstatic.main
       
    10  import xstatic.pkg.angular
       
    11 -import xstatic.pkg.angular_cookies
       
    12 -import xstatic.pkg.angular_mock
       
    13  import xstatic.pkg.bootstrap_datepicker
       
    14  import xstatic.pkg.bootstrap_scss
       
    15  import xstatic.pkg.d3
       
    16 @@ -155,10 +153,6 @@ STATICFILES_FINDERS = (
       
    17  STATICFILES_DIRS = [
       
    18      ('horizon/lib/angular',
       
    19          xstatic.main.XStatic(xstatic.pkg.angular).base_dir),
       
    20 -    ('horizon/lib/angular',
       
    21 -        xstatic.main.XStatic(xstatic.pkg.angular_cookies).base_dir),
       
    22 -    ('horizon/lib/angular',
       
    23 -        xstatic.main.XStatic(xstatic.pkg.angular_mock).base_dir),
       
    24      ('horizon/lib/bootstrap_datepicker',
       
    25          xstatic.main.XStatic(xstatic.pkg.bootstrap_datepicker).base_dir),
       
    26      ('bootstrap',