# HG changeset patch # User Drew Fisher # Date 1403887913 21600 # Node ID e9a8064da9fdee44a1e10454fa0d9fb53244cc92 # Parent 12e9c20eef5a81ad08479447ef2d83c07e5b390b 19073547 editing built-in flavors fails with name too long diff -r 12e9c20eef5a -r e9a8064da9fd components/openstack/horizon/patches/06-remove-console.patch --- a/components/openstack/horizon/patches/06-remove-console.patch Thu Jun 26 19:18:52 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ -In-house patch to remove the ">> open console" link from instance -elements in the Network Topology screen. This patch is -Solaris-specific and not suitable for upstream contribution. - ---- horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html.orig 2014-06-20 08:04:57.394535111 -0600 -+++ horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html 2014-06-20 08:05:47.621066190 -0600 -@@ -16,7 +16,6 @@ - -
- diff -r 12e9c20eef5a -r e9a8064da9fd components/openstack/horizon/patches/07-remove-console.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openstack/horizon/patches/07-remove-console.patch Fri Jun 27 10:51:53 2014 -0600 @@ -0,0 +1,15 @@ +In-house patch to remove the ">> open console" link from instance +elements in the Network Topology screen. This patch is +Solaris-specific and not suitable for upstream contribution. + +--- horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html.orig 2014-06-20 08:04:57.394535111 -0600 ++++ horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html 2014-06-20 08:05:47.621066190 -0600 +@@ -16,7 +16,6 @@ + +
+ diff -r 12e9c20eef5a -r e9a8064da9fd components/openstack/horizon/patches/08-flavor-names.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/openstack/horizon/patches/08-flavor-names.patch Fri Jun 27 10:51:53 2014 -0600 @@ -0,0 +1,41 @@ +In-house patch to increate the maximum length of Flavor names, Flavor +keys, and Flavor values. This patch has not yet been submitted +upstream. + +--- horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/workflows.py.orig 2014-06-27 09:55:09.196764242 -0600 ++++ horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/workflows.py 2014-06-27 09:55:12.447224496 -0600 +@@ -35,7 +35,7 @@ + "Leave this field blank or use 'auto' to set " + "a random UUID4.") + name = forms.RegexField(label=_("Name"), +- max_length=25, ++ max_length=255, + regex=r'^[\w\.\- ]+$', + error_messages={'invalid': _('Name may only ' + 'contain letters, numbers, underscores, ' + +--- horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/extras/forms.py.orig 2014-06-27 09:57:05.195849313 -0600 ++++ horizon-2013.2.3/openstack_dashboard/dashboards/admin/flavors/extras/forms.py 2014-06-27 09:57:19.351010746 -0600 +@@ -28,8 +28,8 @@ + + + class CreateExtraSpec(forms.SelfHandlingForm): +- key = forms.CharField(max_length="25", label=_("Key")) +- value = forms.CharField(max_length="25", label=_("Value")) ++ key = forms.CharField(max_length="255", label=_("Key")) ++ value = forms.CharField(max_length="255", label=_("Value")) + flavor_id = forms.CharField(widget=forms.widgets.HiddenInput) + + def handle(self, request, data): +@@ -46,8 +46,8 @@ + + + class EditExtraSpec(forms.SelfHandlingForm): +- key = forms.CharField(max_length="25", label=_("Key")) +- value = forms.CharField(max_length="25", label=_("Value")) ++ key = forms.CharField(max_length="255", label=_("Key")) ++ value = forms.CharField(max_length="255", label=_("Value")) + flavor_id = forms.CharField(widget=forms.widgets.HiddenInput) + + def handle(self, request, data): +