From b4578c2ee268cc5086d8eb4527dfb2f497b094f4 Mon Sep 17 00:00:00 2001
From: Timur Nurlygayanov <tnurlygayanov@mirantis.com>
Date: Mon, 8 Apr 2013 15:02:51 +0400
Subject: [PATCH] Fixed issue with length of new name.
---
dashboard/glazierdashboard/tabula/forms.py | 2 +-
dashboard/glazierdashboard/tabula/tables.py | 4 ++--
dashboard/glazierdashboard/tabula/views.py | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dashboard/glazierdashboard/tabula/forms.py b/dashboard/glazierdashboard/tabula/forms.py
index a9f78f0..515488d 100644
--- a/dashboard/glazierdashboard/tabula/forms.py
+++ b/dashboard/glazierdashboard/tabula/forms.py
@@ -111,7 +111,7 @@ class WizardFormIISConfiguration(forms.Form):
super(WizardFormIISConfiguration, self).__init__(*args, **kwargs)
link = request.__dict__['META']['HTTP_REFERER']
- environment_id = re.search('tabula/(\S+)', link).group(0)[6:-1]
+ environment_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
domains = api.get_active_directories(request, environment_id)
diff --git a/dashboard/glazierdashboard/tabula/tables.py b/dashboard/glazierdashboard/tabula/tables.py
index a983781..94eabd3 100644
--- a/dashboard/glazierdashboard/tabula/tables.py
+++ b/dashboard/glazierdashboard/tabula/tables.py
@@ -79,7 +79,7 @@ class DeleteService(tables.BatchAction):
def action(self, request, service_id):
link = request.__dict__['META']['HTTP_REFERER']
- datacenter_id = re.search('tabula/(\S+)', link).group(0)[6:-1]
+ datacenter_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
try:
api.service_delete(request, datacenter_id, service_id)
@@ -125,7 +125,7 @@ class UpdateServiceRow(tables.Row):
def get_data(self, request, service_id):
link = request.__dict__['META']['HTTP_REFERER']
- environment_id = re.search('tabula/(\S+)', link).group(0)[6:-1]
+ environment_id = re.search('tabula/(\S+)', link).group(0)[77:-1]
service = api.service_get(request, environment_id, service_id)
diff --git a/dashboard/glazierdashboard/tabula/views.py b/dashboard/glazierdashboard/tabula/views.py
index 158612f..9e4308e 100644
--- a/dashboard/glazierdashboard/tabula/views.py
+++ b/dashboard/glazierdashboard/tabula/views.py
@@ -46,7 +46,7 @@ class Wizard(ModalFormMixin, SessionWizardView, generic.FormView):
def done(self, form_list, **kwargs):
link = self.request.__dict__['META']['HTTP_REFERER']
- environment_id = re.search('tabula/(\S+)', link).group(0)[6:-1]
+ environment_id = re.search('tabula/(\S+)', link).group(0)[7:-1]
url = "/project/tabula/%s/" % environment_id