← Back to branch summary

~ubuntu-branches/ubuntu/saucy/horizon/saucy-updates

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/images_and_snapshots/images/views.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/project/images_and_snapshots/images/views.py
24
24
 
25
25
import logging
26
26
 
27
 
from django.core.urlresolvers import reverse
28
 
from django.core.urlresolvers import reverse_lazy
29
 
from django.utils.translation import ugettext_lazy as _
 
27
from django.core.urlresolvers import reverse  # noqa
 
28
from django.core.urlresolvers import reverse_lazy  # noqa
 
29
from django.utils.translation import ugettext_lazy as _  # noqa
30
30
 
31
31
from horizon import exceptions
32
32
from horizon import forms
34
34
 
35
35
from openstack_dashboard import api
36
36
 
37
 
from openstack_dashboard.dashboards.project.images_and_snapshots.images.forms \
38
 
    import CreateImageForm
39
 
from openstack_dashboard.dashboards.project.images_and_snapshots.images.forms \
40
 
    import UpdateImageForm
41
 
from openstack_dashboard.dashboards.project.images_and_snapshots.images.tabs \
42
 
    import ImageDetailTabs
 
37
from openstack_dashboard.dashboards.project.images_and_snapshots.images \
 
38
    import forms as project_forms
 
39
from openstack_dashboard.dashboards.project.images_and_snapshots.images \
 
40
    import tabs as project_tabs
43
41
 
44
42
 
45
43
LOG = logging.getLogger(__name__)
46
44
 
47
45
 
48
46
class CreateView(forms.ModalFormView):
49
 
    form_class = CreateImageForm
 
47
    form_class = project_forms.CreateImageForm
50
48
    template_name = 'project/images_and_snapshots/images/create.html'
51
49
    context_object_name = 'image'
52
50
    success_url = reverse_lazy("horizon:project:images_and_snapshots:index")
53
51
 
54
52
 
55
53
class UpdateView(forms.ModalFormView):
56
 
    form_class = UpdateImageForm
 
54
    form_class = project_forms.UpdateImageForm
57
55
    template_name = 'project/images_and_snapshots/images/update.html'
58
56
    success_url = reverse_lazy("horizon:project:images_and_snapshots:index")
59
57
 
62
60
            try:
63
61
                self._object = api.glance.image_get(self.request,
64
62
                                                    self.kwargs['image_id'])
65
 
            except:
 
63
            except Exception:
66
64
                msg = _('Unable to retrieve image.')
67
65
                url = reverse('horizon:project:images_and_snapshots:index')
68
66
                exceptions.handle(self.request, msg, redirect=url)
87
85
 
88
86
 
89
87
class DetailView(tabs.TabView):
90
 
    tab_group_class = ImageDetailTabs
 
88
    tab_group_class = project_tabs.ImageDetailTabs
91
89
    template_name = 'project/images_and_snapshots/images/detail.html'