Add display name field #331
3 changed files with 4 additions and 10 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
import copy
|
import copy
|
||||||
|
import hashlib
|
||||||
import html
|
import html
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
|
|
@ -18,10 +19,6 @@ from encrypted_fields.fields import EncryptedJSONField
|
||||||
from kubernetes import client, config
|
from kubernetes import client, config
|
||||||
from kubernetes.client.rest import ApiException
|
from kubernetes.client.rest import ApiException
|
||||||
|
|
||||||
import hashlib
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
from servala.core import rules as perms
|
from servala.core import rules as perms
|
||||||
from servala.core.models.mixins import ServalaModelMixin
|
from servala.core.models.mixins import ServalaModelMixin
|
||||||
from servala.core.validators import kubernetes_name_validator
|
from servala.core.validators import kubernetes_name_validator
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,9 @@
|
||||||
<td>
|
<td>
|
||||||
<a href="{{ instance.urls.base }}">{{ instance.display_name }}</a>
|
<a href="{{ instance.urls.base }}">{{ instance.display_name }}</a>
|
||||||
</td>
|
</td>
|
||||||
<td><code>{{ instance.name }}</code></td>
|
<td>
|
||||||
|
<code>{{ instance.name }}</code>
|
||||||
|
</td>
|
||||||
<td>{{ instance.context.service_definition.service.name }}</td>
|
<td>{{ instance.context.service_definition.service.name }}</td>
|
||||||
<td>{{ instance.context.service_offering.provider.name }}</td>
|
<td>{{ instance.context.service_offering.provider.name }}</td>
|
||||||
<td>{{ instance.context.control_plane.name }}</td>
|
<td>{{ instance.context.control_plane.name }}</td>
|
||||||
|
|
|
||||||
|
|
@ -42,11 +42,6 @@ def other_organization(origin):
|
||||||
return Organization.objects.create(name="Test Org Alternate", origin=origin)
|
return Organization.objects.create(name="Test Org Alternate", origin=origin)
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
|
||||||
def user():
|
|
||||||
return User.objects.create(email="testuser@example.org", password="test")
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture
|
@pytest.fixture
|
||||||
def org_owner(organization):
|
def org_owner(organization):
|
||||||
owner = User.objects.create(email="owner@example.org", password="example")
|
owner = User.objects.create(email="owner@example.org", password="example")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue