← Back to branch summary

~ubuntu-branches/ubuntu/trusty/horizon/trusty-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/admin/images/urls.py

  • Committer: Package Import Robot
  • Author(s): Adam Gandelman
  • Date: 2013-09-06 11:59:43 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20130906115943-h3td0l7tp16mb9oc
Tags: 1:2013.2~b3-0ubuntu1
* New upstream release.
* debian/control: Minimum python-openstack-auth version >= 1.1.1.
* debian/control: Add python-troveclient.
* debian/static: Refresh static assets for 2013.2~b3.
* debian/patches: ubuntu_local_settings.patch -> ubuntu_settings.patch, also
  patch location of secret key in openstack_dashboard/settings.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/admin/images/urls.py
18
18
#    License for the specific language governing permissions and limitations
19
19
#    under the License.
20
20
 
21
 
from django.conf.urls.defaults import patterns
22
 
from django.conf.urls.defaults import url
 
21
from django.conf.urls.defaults import patterns  # noqa
 
22
from django.conf.urls.defaults import url  # noqa
23
23
 
24
 
from openstack_dashboard.dashboards.admin.images.views import CreateView
25
 
from openstack_dashboard.dashboards.admin.images.views import DetailView
26
 
from openstack_dashboard.dashboards.admin.images.views import IndexView
27
 
from openstack_dashboard.dashboards.admin.images.views import UpdateView
 
24
from openstack_dashboard.dashboards.admin.images import views
28
25
 
29
26
 
30
27
urlpatterns = patterns('openstack_dashboard.dashboards.admin.images.views',
31
 
    url(r'^images/$', IndexView.as_view(), name='index'),
32
 
    url(r'^create/$', CreateView.as_view(), name='create'),
33
 
    url(r'^(?P<image_id>[^/]+)/update/$', UpdateView.as_view(), name='update'),
34
 
    url(r'^(?P<image_id>[^/]+)/detail/$', DetailView.as_view(), name='detail')
 
28
    url(r'^images/$', views.IndexView.as_view(), name='index'),
 
29
    url(r'^create/$', views.CreateView.as_view(), name='create'),
 
30
    url(r'^(?P<image_id>[^/]+)/update/$',
 
31
        views.UpdateView.as_view(), name='update'),
 
32
    url(r'^(?P<image_id>[^/]+)/detail/$',
 
33
        views.DetailView.as_view(), name='detail')
35
34
)