← Back to branch summary

~ubuntu-branches/ubuntu/vivid/horizon/vivid-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Chuck Short, Corey Bryant, James Page
  • Date: 2015-01-05 16:42:06 UTC
  • mfrom: (0.9.1) (1.2.5)
  • Revision ID: package-import@ubuntu.com-20150105164206-zrt2q64h4weugkur
Tags: 1:2015.1~b1-0ubuntu1
[ Chuck Short ]
* Open for Kilo.
* d/control: Update bzr branches 
* d/patches/embedded-xstatic.patch: Refreshed
* d/patches/add-juju-environment-download.patch: Temporarily disabled.

[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/watch: Update uversionmangle for kilo beta naming.
* d/control: Bumped Standards-Version to 3.9.6.

[ James Page ]
* d/bundle-xstatic.sh: Tweak grep to be case insensitive.
* d/p/add-juju-environment-download.patch: Rebase for kilo-1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
openstack_dashboard/dashboards/project/routers/forms.py
83
83
 
84
84
class UpdateForm(forms.SelfHandlingForm):
85
85
    name = forms.CharField(label=_("Name"), required=False)
86
 
    # TODO(amotoki): make UP/DOWN translatable
87
 
    admin_state = forms.ChoiceField(choices=[(True, 'UP'), (False, 'DOWN')],
 
86
    admin_state = forms.ChoiceField(choices=[(True, _('UP')),
 
87
                                             (False, _('DOWN'))],
88
88
                                    label=_("Admin State"))
89
89
    router_id = forms.CharField(label=_("ID"),
90
90
                                widget=forms.HiddenInput())
111
111
                            ('distributed', _('Distributed'))]
112
112
            self.fields['mode'].choices = mode_choices
113
113
 
114
 
        self.ha_allowed = api.neutron.get_feature_permission(self.request,
115
 
                                                             "l3-ha", "update")
 
114
        # TODO(amotoki): Due to Neutron Bug 1378525, Neutron disables
 
115
        # PUT operation. It will be fixed in Kilo cycle.
 
116
        # self.ha_allowed = api.neutron.get_feature_permission(
 
117
        #     self.request, "l3-ha", "update")
 
118
        self.ha_allowed = False
116
119
        if not self.ha_allowed:
117
120
            del self.fields['ha']
118
121