Added fix-request.REQUEST-does-not-exist.patch.

Rewritten-From: 57e755c683153cc7f19b988f5c0d21e1a1ab4dbe

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 03fb9d14025d99f46c4c8c100f0487ab03812313..b8444afc6bfee3e76890b1a6f35f33cf3f2caeff 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -8,6 +8,7 @@ horizon (2:8.0.0-4) unstable; urgency=medium
   * Added explicitly-declare-app_label.patch.
   * Added add-openstack_auth-in-INSTALLED_APPS.patch.
   * Added django.template.base.library-moved.patch.
+  * Added fix-request.REQUEST-does-not-exist.patch.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 11 Jan 2016 02:54:28 +0000
 

diff --git a/trusty/debian/patches/fix-request.REQUEST-does-not-exist.patch b/trusty/debian/patches/fix-request.REQUEST-does-not-exist.patch
new file mode 100644 (file)
index 0000000..124b877
--- /dev/null
+++ b/trusty/debian/patches/fix-request.REQUEST-does-not-exist.patch
@@ -0,0 +1,231 @@
+Description: Fix request.REQUEST does not exist
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2016-01-11
+
+--- horizon-8.0.0.orig/horizon/workflows/views.py
++++ horizon-8.0.0/horizon/workflows/views.py
+@@ -90,7 +90,7 @@ class WorkflowView(hz_views.ModalBackdro
+         context = super(WorkflowView, self).get_context_data(**kwargs)
+         workflow = self.get_workflow()
+         context[self.context_object_name] = workflow
+-        next = self.request.REQUEST.get(workflow.redirect_param_name, None)
++        next = self.request.GET.get(workflow.redirect_param_name, None)
+         context['REDIRECT_URL'] = next
+         context['layout'] = self.get_layout()
+         # For consistency with Workflow class
+@@ -210,5 +210,5 @@ class WorkflowView(hz_views.ModalBackdro
+                 response.content = json.dumps(data)
+                 response["X-Horizon-Add-To-Field"] = field_id
+             return response
+-        next_url = self.request.REQUEST.get(workflow.redirect_param_name, None)
++        next_url = self.request.GET.get(workflow.redirect_param_name, None)
+         return shortcuts.redirect(next_url or workflow.get_success_url())
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/workflows/create.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/workflows/create.py
+@@ -175,11 +175,11 @@ class ConfigureNodegroupsAction(workflow
+         super(ConfigureNodegroupsAction, self). \
+             __init__(request, *args, **kwargs)
+ 
+-        plugin = request.REQUEST.get("plugin_name")
+-        version = request.REQUEST.get("hadoop_version")
++        plugin = request.GET.get("plugin_name")
++        version = request.GET.get("hadoop_version")
+         if plugin and not version:
+             version_name = plugin + "_version"
+-            version = request.REQUEST.get(version_name)
++            version = request.GET.get(version_name)
+ 
+         if not plugin or not version:
+             self.templates = saharaclient.nodegroup_template_find(request)
+@@ -187,13 +187,13 @@ class ConfigureNodegroupsAction(workflow
+             self.templates = saharaclient.nodegroup_template_find(
+                 request, plugin_name=plugin, hadoop_version=version)
+ 
+-        deletable = request.REQUEST.get("deletable", dict())
++        deletable = request.GET.get("deletable", dict())
+ 
+         request_source = None
+         if 'forms_ids' in request.POST:
+                 request_source = request.POST
+-        elif 'forms_ids' in request.REQUEST:
+-                request_source = request.REQUEST
++        elif 'forms_ids' in request.GET:
++                request_source = request.GET
+         if request_source:
+             self.groups = []
+             for id in json.loads(request_source['forms_ids']):
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/clusters/workflows/create.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/clusters/workflows/create.py
+@@ -168,9 +168,9 @@ class GeneralConfigAction(workflows.Acti
+         # cluster_template_id comes from cluster templates table, when
+         # Create Cluster from template is clicked there
+         selected_template_name = None
+-        if request.REQUEST.get("cluster_template_name"):
++        if request.GET.get("cluster_template_name"):
+             selected_template_name = (
+-                request.REQUEST.get("cluster_template_name"))
++                request.GET.get("cluster_template_name"))
+         if selected_template_name:
+             for template in templates:
+                 if template.name == selected_template_name:
+@@ -178,7 +178,7 @@ class GeneralConfigAction(workflows.Acti
+                     break
+         else:
+             selected_template_id = (
+-                request.REQUEST.get("cluster_template_id", None))
++                request.GET.get("cluster_template_id", None))
+ 
+         for template in templates:
+             if template.id == selected_template_id:
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/jobs/views.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/jobs/views.py
+@@ -98,8 +98,8 @@ class LaunchJobView(workflows.WorkflowVi
+ 
+     def get(self, request, *args, **kwargs):
+         if request.is_ajax():
+-            if request.REQUEST.get("json", None):
+-                job_id = request.REQUEST.get("job_id")
++            if request.GET.get("json", None):
++                job_id = request.GET.get("job_id")
+                 job_type = saharaclient.job_get(request, job_id).type
+                 return http.HttpResponse(json.dumps({"job_type": job_type}),
+                                          content_type='application/json')
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/jobs/workflows/create.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/jobs/workflows/create.py
+@@ -105,9 +105,9 @@ class GeneralConfigAction(workflows.Acti
+     def __init__(self, request, context, *args, **kwargs):
+         super(GeneralConfigAction,
+               self).__init__(request, context, *args, **kwargs)
+-        if request.REQUEST.get("guide_job_type"):
++        if request.GET.get("guide_job_type"):
+             self.fields["job_type"].initial = (
+-                request.REQUEST.get("guide_job_type").lower())
++                request.GET.get("guide_job_type").lower())
+ 
+     def populate_job_type_choices(self, request, context):
+         choices = []
+@@ -156,8 +156,8 @@ class ConfigureInterfaceArgumentsAction(
+         request_source = None
+         if 'argument_ids' in request.POST:
+                 request_source = request.POST
+-        elif 'argument_ids' in request.REQUEST:
+-                request_source = request.REQUEST
++        elif 'argument_ids' in request.GET:
++                request_source = request.GET
+         if request_source:
+             self.arguments = []
+             for id in json.loads(request_source['argument_ids']):
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/jobs/workflows/launch.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/jobs/workflows/launch.py
+@@ -54,14 +54,14 @@ class JobExecutionGeneralConfigAction(wo
+                                                               *args,
+                                                               **kwargs)
+ 
+-        if request.REQUEST.get("job_id", None) is None:
++        if request.GET.get("job_id", None) is None:
+             self.fields["job"] = forms.ChoiceField(
+                 label=_("Job"))
+             self.fields["job"].choices = self.populate_job_choices(request)
+         else:
+             self.fields["job"] = forms.CharField(
+                 widget=forms.HiddenInput(),
+-                initial=request.REQUEST.get("job_id", None))
++                initial=request.GET.get("job_id", None))
+ 
+     def populate_job_input_choices(self, request, context):
+         return self.get_data_source_choices(request, context)
+@@ -214,7 +214,7 @@ class JobConfigAction(workflows.Action):
+ 
+     def __init__(self, request, *args, **kwargs):
+         super(JobConfigAction, self).__init__(request, *args, **kwargs)
+-        job_ex_id = request.REQUEST.get("job_execution_id")
++        job_ex_id = request.GET.get("job_execution_id")
+         if job_ex_id is not None:
+             job_ex = saharaclient.job_execution_get(request, job_ex_id)
+             job = saharaclient.job_get(request, job_ex.job_id)
+@@ -272,7 +272,7 @@ class JobConfigAction(workflows.Action):
+         return cleaned_data
+ 
+     def populate_property_name_choices(self, request, context):
+-        job_id = request.REQUEST.get("job_id") or request.REQUEST.get("job")
++        job_id = request.GET.get("job_id") or request.GET.get("job")
+         job_type = saharaclient.job_get(request, job_id).type
+         job_configs = (
+             saharaclient.job_get_configs(request, job_type).job_config)
+@@ -419,7 +419,7 @@ class JobExecutionInterfaceConfigAction(
+         interface = job.interface or []
+         interface_args = {}
+ 
+-        job_ex_id = request.REQUEST.get("job_execution_id")
++        job_ex_id = request.GET.get("job_execution_id")
+         if job_ex_id is not None:
+             job_ex = saharaclient.job_execution_get(request, job_ex_id)
+             job = saharaclient.job_get(request, job_ex.job_id)
+@@ -507,7 +507,7 @@ class SelectHadoopPluginAction(t_flows.S
+             label=_("Job params"),
+             widget=forms.HiddenInput(attrs={"class": "hidden_create_field"}))
+ 
+-        job_ex_id = request.REQUEST.get("job_execution_id")
++        job_ex_id = request.GET.get("job_execution_id")
+         if job_ex_id is not None:
+             self.fields["job_execution_id"] = forms.ChoiceField(
+                 label=_("Job Execution ID"),
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/workflows/create.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/workflows/create.py
+@@ -176,11 +176,11 @@ class GeneralConfigAction(workflows.Acti
+         for param in node_parameters:
+             self.fields[param.name] = workflow_helpers.build_control(param)
+ 
+-        if request.REQUEST.get("guide_template_type"):
++        if request.GET.get("guide_template_type"):
+             self.fields["guide_template_type"] = forms.CharField(
+                 required=False,
+                 widget=forms.HiddenInput(),
+-                initial=request.REQUEST.get("guide_template_type"))
++                initial=request.GET.get("guide_template_type"))
+ 
+         try:
+             volume_types = cinder.volume_type_list(request)
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/utils/anti_affinity.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/utils/anti_affinity.py
+@@ -46,9 +46,9 @@ def populate_anti_affinity_choices(self,
+             for process in processes:
+                 process_choices.append((process, process))
+ 
+-        cluster_template_id = request.REQUEST.get("cluster_template_id", None)
++        cluster_template_id = request.GET.get("cluster_template_id", None)
+         if cluster_template_id is None:
+-            selected_processes = request.REQUEST.get("aa_groups", [])
++            selected_processes = request.GET.get("aa_groups", [])
+         else:
+             cluster_template = (
+                 sahara.cluster_templates.get(cluster_template_id))
+--- horizon-8.0.0.orig/openstack_dashboard/contrib/sahara/content/data_processing/utils/workflow_helpers.py
++++ horizon-8.0.0/openstack_dashboard/contrib/sahara/content/data_processing/utils/workflow_helpers.py
+@@ -200,9 +200,9 @@ def get_security_groups(request, securit
+ def get_plugin_and_hadoop_version(request):
+     plugin_name = None
+     hadoop_version = None
+-    if request.REQUEST.get("plugin_name"):
+-        plugin_name = request.REQUEST["plugin_name"]
+-        hadoop_version = request.REQUEST["hadoop_version"]
++    if request.GET.get("plugin_name"):
++        plugin_name = request.GET["plugin_name"]
++        hadoop_version = request.GET["hadoop_version"]
+     return (plugin_name, hadoop_version)
+ 
+ 
+--- horizon-8.0.0.orig/openstack_dashboard/dashboards/project/routers/ports/forms.py
++++ horizon-8.0.0/openstack_dashboard/dashboards/project/routers/ports/forms.py
+@@ -49,8 +49,8 @@ class AddInterface(forms.SelfHandlingFor
+         tenant_id = self.request.user.tenant_id
+         networks = []
+         router_subnet_ids = []
+-        router_id = request.REQUEST.get('router_id',
+-                                        self.initial.get('router_id'))
++        router_id = request.GET.get('router_id',
++                                    self.initial.get('router_id'))
+ 
+         try:
+             networks = api.neutron.network_list_for_tenant(request, tenant_id)

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 47890198f060ff30d4bdd886faf8f630e948acc7..c8c0d19b90d68d218a7fc0482d22b26f13d1e460 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -9,3 +9,4 @@ handle-django.forms.util-rename.patch
 explicitly-declare-app_label.patch
 add-openstack_auth-in-INSTALLED_APPS.patch
 django.template.base.library-moved.patch
+fix-request.REQUEST-does-not-exist.patch