← Back to branch summary

~ubuntu-branches/ubuntu/raring/horizon/raring

« back to all changes in this revision

Viewing changes to openstack_dashboard/dashboards/project/routers/ports/forms.py

  • Committer: Package Import Robot
  • Author(s): James Page, James Page, Adam Gandelman
  • Date: 2013-03-20 11:20:17 UTC
  • mfrom: (1.1.25)
  • Revision ID: package-import@ubuntu.com-20130320112017-15h2zdnqy20lc089
Tags: 1:2013.1~rc1-0ubuntu1
https://launchpad.net/bugs/1130610
[ James Page ]
* New upstream release candidate for Grizzly:
  - Recompress static JS and CSS and generate new manifest.json for
    offline compression.
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org.
* d/control: Version python-compressor >= 1.2 (LP: #1130610).

[ Adam Gandelman ]
* debian/patches/ubuntu_local_settings.py: Refresh, specify memcache
  location as part of CACHES, as per upstream changes to example config.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/routers/ports/forms.py
28
28
 
29
29
 
30
30
class AddInterface(forms.SelfHandlingForm):
31
 
    subnet_id = forms.ChoiceField(label=_("Subnet ID"), required=False)
 
31
    subnet_id = forms.ChoiceField(label=_("Subnet"), required=False)
 
32
    router_name = forms.CharField(label=_("Router Name"),
 
33
                                  widget=forms.TextInput(
 
34
                                      attrs={'readonly': 'readonly'}))
32
35
    router_id = forms.CharField(label=_("Router ID"),
33
36
                                widget=forms.TextInput(
34
37
                                    attrs={'readonly': 'readonly'}))
84
87
 
85
88
 
86
89
class SetGatewayForm(forms.SelfHandlingForm):
87
 
    network_id = forms.ChoiceField(label=_("Network ID"), required=False)
 
90
    network_id = forms.ChoiceField(label=_("External Network"), required=False)
 
91
    router_name = forms.CharField(label=_("Router Name"),
 
92
                                  widget=forms.TextInput(
 
93
                                      attrs={'readonly': 'readonly'}))
88
94
    router_id = forms.CharField(label=_("Router ID"),
89
95
                                widget=forms.TextInput(
90
96
                                    attrs={'readonly': 'readonly'}))
91
 
    failure_url = 'horizon:project:routers:detail'
 
97
    failure_url = 'horizon:project:routers:index'
92
98
 
93
99
    def __init__(self, request, *args, **kwargs):
94
100
        super(SetGatewayForm, self).__init__(request, *args, **kwargs)
103
109
            msg = _('Failed to get network list %s') % e.message
104
110
            LOG.info(msg)
105
111
            messages.error(request, msg)
106
 
            redirect = reverse(self.failure_url,
107
 
                               args=[request.REQUEST['router_id']])
 
112
            redirect = reverse(self.failure_url)
108
113
            exceptions.handle(request, msg, redirect=redirect)
109
114
            return
110
115
        choices = [(network.id, network.name or network.id)
128
133
            msg = _('Failed to set gateway %s') % e.message
129
134
            LOG.info(msg)
130
135
            messages.error(request, msg)
131
 
            redirect = reverse(self.failure_url, args=[data['router_id']])
 
136
            redirect = reverse(self.failure_url)
132
137
            exceptions.handle(request, msg, redirect=redirect)