Merge b771958 into 1b59740

kiwitcms · Apr 24, 2020 · b18f3c9 · b18f3c9
2 parents 1b59740 + b771958
commit b18f3c9
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/tcms_tenants/locale/en/LC_MESSAGES/django.po b/tcms_tenants/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-22 10:19+0000\n"
+"POT-Creation-Date: 2020-04-24 13:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,7 +75,11 @@ msgstr ""
 msgid "Schema"
 msgstr ""
 
-#: tcms_tenants/templates/tcms_tenants/new.html:46
+#: tcms_tenants/templates/tcms_tenants/new.html:40
+msgid "Valid schema_name pattern"
+msgstr ""
+
+#: tcms_tenants/templates/tcms_tenants/new.html:48
 msgid "Save"
 msgstr ""
 

diff --git a/tcms_tenants/templates/tcms_tenants/new.html b/tcms_tenants/templates/tcms_tenants/new.html
@@ -31,12 +31,14 @@
                     <div class="input-group">
                         <span class="input-group-addon">https://</span>
                         <input type="text" id="id_schema" maxlength="{{ form.fields.schema_name.max_length }}"
-                               placeholder="company-team-project-name"
                                name="schema_name" value="{{ form.schema_name.value|default:'' }}"
                                class="form-control" required>
                         <span class="input-group-addon">.{{ tcms_tenants_domain }}</span>
                     </div>
                     {{ form.schema_name.errors }}
+                    <p class="help-block">
+                        {% trans "Valid schema_name pattern" %}: ^[a-z0-9]{1,63}$
+                    </p>
                 </div>
             </div>
             {% block extra_contents %}

diff --git a/tcms_tenants/tests/test_views.py b/tcms_tenants/tests/test_views.py
@@ -53,6 +53,22 @@ def test_create_tenant_shows_defaults_for_trial_and_paid_until(self):
         self.assertContains(response,
                             '<input id="id_paid_until" name="paid_until" type="hidden">',
                             html=True)
+        self.assertContains(response, 'Valid schema_name pattern: ^[a-z0-9]{1,63}$')
+
+    def test_invalid_schema_name_shows_errors(self):
+        response = self.client.post(
+            reverse('tcms_tenants:create-tenant'),
+            {
+                'name': 'Dash Is Not Allowed',
+                'schema_name': 'kiwi-tcms',
+                'on_trial': True,
+                'paid_until': '',
+            })
+
+        self.assertContains(response, 'Invalid string used for the schema name.')
+        self.assertContains(response, 'Valid schema_name pattern: ^[a-z0-9]{1,63}$')
+        self.assertFalse(
+            Tenant.objects.filter(schema_name='kiwi-tcms').exists())
 
     def test_create_tenant_with_name_schema_only(self):
         expected_url = 'https://tinc.%s' % settings.KIWI_TENANTS_DOMAIN