diff --git a/openstack_dashboard/dashboards/project/data_processing/data_sources/templates/data_processing.data_sources/data_sources_form_script.html b/openstack_dashboard/dashboards/project/data_processing/data_sources/templates/data_processing.data_sources/data_sources_form_script.html
index b27e0e789cf..20532f8a496 100644
--- a/openstack_dashboard/dashboards/project/data_processing/data_sources/templates/data_processing.data_sources/data_sources_form_script.html
+++ b/openstack_dashboard/dashboards/project/data_processing/data_sources/templates/data_processing.data_sources/data_sources_form_script.html
@@ -3,19 +3,16 @@
addHorizonLoadEvent(function () {
horizon.modals.addModalInitFunction(function (modal) {
$("#id_data_source_type").change(function() {
- var label = $("#id_data_source_url_label");
var username = $("#id_data_source_credential_user").closest(".control-group");
var password = $("#id_data_source_credential_pass").closest(".control-group")
switch($(this).val()) {
case "hdfs":
- label.html("hdfs://");
username.hide();
password.hide();
break;
case "swift":
username.show();
password.show();
- label.html("swift://");
break;
}
});
diff --git a/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py b/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py
index 03a7f5768ed..be2ec7b7936 100644
--- a/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py
+++ b/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py
@@ -13,10 +13,6 @@
import logging
-from django.forms import util
-from django.forms import widgets
-
-from django.utils.safestring import mark_safe
from django.utils.translation import ugettext_lazy as _
from horizon import exceptions
@@ -28,16 +24,6 @@
LOG = logging.getLogger(__name__)
-class LabeledInput(widgets.Input):
- def render(self, name, values, attrs=None):
- final_attrs = self.build_attrs(attrs, type=self.input_type, name=name)
- output = "%s%s" %\
- ("id_%s_label" % name,
- "swift://",
- ('' % util.flatatt(final_attrs)))
- return mark_safe(output)
-
-
class GeneralConfigAction(workflows.Action):
data_source_name = forms.CharField(label=_("Name"))
@@ -46,8 +32,7 @@ class GeneralConfigAction(workflows.Action):
choices=[("swift", "Swift"), ("hdfs", "HDFS")],
widget=forms.Select(attrs={"class": "data_source_type_choice"}))
- data_source_url = forms.CharField(label=_("URL"),
- widget=LabeledInput())
+ data_source_url = forms.CharField(label=_("URL"))
data_source_credential_user = forms.CharField(label=_("Source username"))
@@ -88,9 +73,12 @@ def contribute(self, data, context):
for k, v in data.items():
context["general_" + k] = v
- context["source_url"] = "%s://%s" % \
- (context["general_data_source_type"],
- context["general_data_source_url"])
+ context["source_url"] = context["general_data_source_url"]
+
+ if context["general_data_source_type"] == "swift":
+ if not context["general_data_source_url"].startswith("swift://"):
+ context["source_url"] = "swift://{0}".format(
+ context["general_data_source_url"])
return context