-
+ Submitted
Accepted
On hold
+ Processing
Failed
{% if can_list_support %}
Supports
@@ -54,8 +55,8 @@
-
- {{ service.service.name }}
+
+ {{ service.service.name }}
@@ -86,6 +87,13 @@
+
+ {% if service.processing_requests %}
+ {{ service.processing_requests }}
+
+ {% endif %}
+
{% if service.failed_requests %}
To be reviewed
{% if can_list_instance %}
{% block extra_header_button %}
{% if extra_html_button_path %}
{% include extra_html_button_path %}
diff --git a/templates/generics/doc_aside.html b/templates/generics/doc_aside.html
index 506b82047..efecd8270 100644
--- a/templates/generics/doc_aside.html
+++ b/templates/generics/doc_aside.html
@@ -20,7 +20,7 @@
data-parent="#accordion_docs">
diff --git a/templates/home/home.html b/templates/home/home.html
index f5d839130..de1772ae9 100644
--- a/templates/home/home.html
+++ b/templates/home/home.html
@@ -36,6 +36,7 @@
data-parent="#accordion_docs">
- {{ doc.content| safe_markdown }}
+ {{ doc.content | safe_markdown }}
- {{ doc.content| safe_markdown }}
+ {{ doc.content | safe_markdown }}
Service overview
Service overview
>Service overview
{% endif %}
-
+
{{ total_instance }}
Available instances
@@ -140,7 +148,7 @@{{ total_instance }}
{% endif %} {% if can_list_request %}
-
diff --git a/templates/service_catalog/approvalworkflow_detail.html b/templates/service_catalog/approvalworkflow_detail.html
index cf9cd915e..73fb958ee 100644
--- a/templates/service_catalog/approvalworkflow_detail.html
+++ b/templates/service_catalog/approvalworkflow_detail.html
@@ -15,148 +15,161 @@
{% endblock %}
{% block main %}
-
+
+ Workflows
+
+ {% endif %}
{{ total_request }}
@@ -160,7 +168,7 @@{{ total_request }}
{% if can_list_support %}
-
diff --git a/templates/profiles/team_detail.html b/templates/profiles/team_detail.html
index 386b71fc3..d396f6b61 100644
--- a/templates/profiles/team_detail.html
+++ b/templates/profiles/team_detail.html
@@ -73,8 +73,11 @@
+
+ Workflows
+
+ {% endif %}
{{ total_support_opened }}
Opened supports
diff --git a/templates/profiles/custom_columns/preview_workflow.html b/templates/profiles/custom_columns/preview_workflow.html new file mode 100644 index 000000000..d80b52560 --- /dev/null +++ b/templates/profiles/custom_columns/preview_workflow.html @@ -0,0 +1,3 @@ + + Preview + diff --git a/templates/profiles/organization_detail.html b/templates/profiles/organization_detail.html index 38135c962..c940b677a 100644 --- a/templates/profiles/organization_detail.html +++ b/templates/profiles/organization_detail.html @@ -87,6 +87,11 @@{{ object.name }}
Teams {% endif %} + {% if workflows %} +
@@ -112,6 +117,11 @@
+ {{ object.name }}
{% render_table quotas %} {% endif %}
+ {% if workflows %}
+ {% render_table workflows %}
+ {% endif %}
+
{{ object.name }}
Users {% endif %} - - + {% if workflows %} +
@@ -96,6 +99,11 @@
+ {{ object.name }}
{% render_table quotas %} {% endif %}
+ {% if workflows %}
+ {% render_table workflows %}
+ {% endif %}
+
-
-
-
-
-
- {{ object.name }}
-
-
diff --git a/tests/test_plugins/test_provided_validators/__init__.py b/tests/test_plugins/test_provided_validators/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_plugins/test_provided_validators/test_is_json.py b/tests/test_plugins/test_provided_validators/test_is_json.py
new file mode 100644
index 000000000..b9533c3da
--- /dev/null
+++ b/tests/test_plugins/test_provided_validators/test_is_json.py
@@ -0,0 +1,73 @@
+from django.core.exceptions import ValidationError
+from django.test import TestCase, override_settings
+from rest_framework import serializers
+from Squest.utils.plugin_controller import PluginController
+
+
+class TestSSHPublicKeyValidator(TestCase):
+ def test_with_text(self):
+ json_text = "aaaabbbbcccc"
+ loaded_module = PluginController.get_ui_field_validator_def("is_json")
+ with self.assertRaises(ValidationError):
+ loaded_module(json_text)
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(json_text)
+
+ def test_with_empty_text(self):
+ json_text = ""
+ loaded_module = PluginController.get_ui_field_validator_def("is_json")
+ with self.assertRaises(ValidationError):
+ loaded_module(json_text)
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(json_text)
+
+ def test_with_double_json(self):
+ json_text = '{"my_json": "is_ok", other_json: {"in_side": 13}}{"outside": "is_not_ok"}'
+ loaded_module = PluginController.get_ui_field_validator_def("is_json")
+ with self.assertRaises(ValidationError):
+ loaded_module(json_text)
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(json_text)
+
+ def test_with_single_quote(self):
+ json_text = "{'my_json': 'is_ok', other_json: {'in_side': 13}}"
+ loaded_module = PluginController.get_ui_field_validator_def("is_json")
+ with self.assertRaises(ValidationError):
+ loaded_module(json_text)
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(json_text)
+
+ def test_with_missing_quote(self):
+ json_text = '{"my_json": "is_ok", other_json: {"in_side": 13}}'
+ loaded_module = PluginController.get_ui_field_validator_def("is_json")
+ with self.assertRaises(ValidationError):
+ loaded_module(json_text)
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(json_text)
+
+ def test_with_additional_comma(self):
+ json_text = '{"my_json": "is_ok", "other_json": {"in_side": 13},}'
+ loaded_module = PluginController.get_ui_field_validator_def("is_json")
+ with self.assertRaises(ValidationError):
+ loaded_module(json_text)
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(json_text)
+
+ def test_with_json(self):
+ json_text = '{"my_json": "is_ok", "other_json": {"in_side": 13}}'
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ try:
+ loaded_module(json_text)
+ except ValidationError:
+ self.fail("UI validator fail")
+ loaded_module = PluginController.get_api_field_validator_def("is_json")
+ try:
+ loaded_module(json_text)
+ except serializers.ValidationError:
+ self.fail("API validator fail")
diff --git a/tests/test_plugins/test_provided_validators/test_is_public_ssh_key.py b/tests/test_plugins/test_provided_validators/test_is_public_ssh_key.py
new file mode 100644
index 000000000..825f93a0e
--- /dev/null
+++ b/tests/test_plugins/test_provided_validators/test_is_public_ssh_key.py
@@ -0,0 +1,43 @@
+from django.core.exceptions import ValidationError
+from django.test import TestCase, override_settings
+from rest_framework import serializers
+from Squest.utils.plugin_controller import PluginController
+
+
+class TestSSHPublicKeyValidator(TestCase):
+ def test_with_wrong_ssh_key(self):
+ public_ssh_key = "aaaa bbbb cccc"
+ loaded_module = PluginController.get_ui_field_validator_def("is_public_ssh_key")
+ with self.assertRaises(ValidationError):
+ loaded_module(public_ssh_key)
+ loaded_module = PluginController.get_api_field_validator_def("is_public_ssh_key")
+ with self.assertRaises(serializers.ValidationError):
+ loaded_module(public_ssh_key)
+
+ def test_with_rsa(self):
+ public_ssh_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDeJvMJmt63nSi7sO6tKGHxnmvOckWaypcZKaPl5KLDCL5RsiaZMi/NrniiLsgv8FX5txQmsU2e1W7Ozh6VBGVErwV7S/GCkcYqO91lhZ+jVA7QHsK7hQWubq5zJzBm+p2HFSQk3ch0tXxhMbGivL1AkqziABgKLzhFeLIWzG3OCy8kj/F9b8doRiQ2FkMCT3sCGEts7nXQJ/0WyMj0FwyNr/R93+P/57M2QG49Wr7iFInzr6+BDcClmGMNHXNepvLQFHuW4suVU3Q7UaHFp9b1kDGbcbiw/w4JEutxuKv+DLOfm4pd8YhQsB8begILTwi5PJpvqfCSuE1jMN054t7xVssJU1Po5jMcSWfN8Q+/l7SSFgkCRH4Ul7LF+bMM8z3FejMp96CFmFagIePzqpnwjy4NLSEeESQhVCosPXpwCuwvZuebEgeptV8mK3TnVUksZmwnQrqwDqa6s9nZCjf/UZ03b73eFPcRwO0dgC2aWXvjzCB9SimdIBaMYMjtnuZJxADrb1AG9MTaBIj4bvn3phsx8OyZpc0c7mdyp1Quh5jBOwNJX7wU716o5lu5cMHTE29VFMIGz3yT+/ETxpC3/9CWuKLQoJFcV9PNzBScIIB2m7A+zkaEFbCDoCJqX8R5fs6Vsnq3vyEDu2VCGw3NUW+lQ+Di4y4+pAkhTaI4Mw== squest@fake"
+ loaded_module = PluginController.get_api_field_validator_def("is_public_ssh_key")
+ try:
+ loaded_module(public_ssh_key)
+ except ValidationError:
+ self.fail("UI validator fail")
+ loaded_module = PluginController.get_api_field_validator_def("is_public_ssh_key")
+ try:
+ loaded_module(public_ssh_key)
+ except serializers.ValidationError:
+ self.fail("API validator fail")
+
+ def test_with_ed25519(self):
+ public_ssh_key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPYqhDwOvBaWrGC257fdxfy1iMM6ZY2VwgmP+XlRRMT8 squest@fake"
+ loaded_module = PluginController.get_api_field_validator_def("is_public_ssh_key")
+ try:
+ loaded_module(public_ssh_key)
+ except ValidationError:
+ self.fail("UI validator fail")
+ loaded_module = PluginController.get_api_field_validator_def("is_public_ssh_key")
+ try:
+ loaded_module(public_ssh_key)
+ except serializers.ValidationError:
+ self.fail("API validator fail")
+
+
diff --git a/tests/test_profiles/test_model/test_scope_get_workflow.py b/tests/test_profiles/test_model/test_scope_get_workflow.py
new file mode 100644
index 000000000..e19702db6
--- /dev/null
+++ b/tests/test_profiles/test_model/test_scope_get_workflow.py
@@ -0,0 +1,49 @@
+from profiles.models import Scope
+from service_catalog.models import ApprovalWorkflow, Request
+from tests.setup import SetupRequest
+from tests.utils import TransactionTestUtils
+
+from django.db.models.query import QuerySet
+
+
+class TestApprovalWorkflowReset(TransactionTestUtils, SetupRequest):
+
+ def setUp(self):
+ SetupRequest.setUp(self)
+
+ def _create_approval(self, operation, scopes=None):
+ if isinstance(scopes, Scope):
+ scopes = [scopes]
+ aw = ApprovalWorkflow.objects.create(
+ name=f"AW - {operation} - {scopes}",
+ operation=operation,
+ enabled=True
+ )
+ if scopes:
+ aw.scopes.set(scopes)
+ return aw
+
+ def test_get_workflows(self):
+ # team1org2 -> no workflows
+ self.assertQuerysetEqualID(self.team1org2.get_workflows(), ApprovalWorkflow.objects.none())
+
+ # team1org2 -> workflow for all on operation_create1
+ aw_for_all = self._create_approval(self.operation_create_1)
+ self.assertQuerysetEqualID(self.team1org2.get_workflows(), ApprovalWorkflow.objects.filter(id=aw_for_all.id))
+
+ # team1org2 -> workflow for org2 on operation_create1 ("All" overridden by org2)
+ aw_for_org2 = self._create_approval(self.operation_create_1, self.org2)
+ self.assertQuerysetEqualID(self.team1org2.get_workflows(), ApprovalWorkflow.objects.filter(id=aw_for_org2.id))
+
+ # team1org2 -> workflow for team1org2 on operation_create1 ( org2 overridden by team1org2)
+ aw_for_org2_team1 = self._create_approval(self.operation_create_1, self.team1org2)
+ self.assertQuerysetEqualID(
+ self.team1org2.get_workflows(),
+ ApprovalWorkflow.objects.filter(id=aw_for_org2_team1.id)
+ )
+
+ # team1org2 -> workflow for team1org2 on operation_create1 ( org2 overridden by team1org2)
+ # team1org2 -> + workflow for all on operation_update1
+ aw_for_all_update1 = self._create_approval(self.operation_update_1)
+ self.assertQuerysetEqualID(self.team1org2.get_workflows(), ApprovalWorkflow.objects.filter(
+ id__in=[aw_for_org2_team1.id, aw_for_all_update1.id]))
diff --git a/tests/test_service_catalog/test_api/test_serializers/test_approval_workflow_serializer.py b/tests/test_service_catalog/test_api/test_serializers/test_approval_workflow_serializer.py
index 6a2003498..30530dabd 100644
--- a/tests/test_service_catalog/test_api/test_serializers/test_approval_workflow_serializer.py
+++ b/tests/test_service_catalog/test_api/test_serializers/test_approval_workflow_serializer.py
@@ -30,6 +30,21 @@ def test_can_add_another_scope_to_scopes(self):
serializer = ApprovalWorkflowSerializerEdit(instance=self.test_approval_workflow, data=data)
self.assertTrue(serializer.is_valid())
+ def test_can_add_another_scope_to_scopes_when_edit(self):
+ existing_approval = ApprovalWorkflow.objects.create(name="test",
+ operation=self.create_operation_test,
+ enabled=True)
+
+ existing_approval.scopes.set([self.test_quota_scope])
+ data = {
+ "name": "test_workflow",
+ "operation": self.create_operation_test.id,
+ "scopes": [self.test_quota_scope.id]
+ }
+ serializer = ApprovalWorkflowSerializerEdit(instance=self.test_approval_workflow, data=data)
+ self.assertFalse(serializer.is_valid())
+ self.assertIn("has already an approval workflow based on this operation", serializer.errors["scopes"][0])
+
def test_cannot_valid_with_empty_scopes_if_already_exists(self):
existing_approval = ApprovalWorkflow.objects.create(name="test",
operation=self.create_operation_test,
diff --git a/tests/test_service_catalog/test_forms/test_approval_workflow_form.py b/tests/test_service_catalog/test_forms/test_approval_workflow_form.py
index 375b6c4ea..1f930ea4a 100644
--- a/tests/test_service_catalog/test_forms/test_approval_workflow_form.py
+++ b/tests/test_service_catalog/test_forms/test_approval_workflow_form.py
@@ -32,6 +32,24 @@ def test_clean(self):
self.assertFalse(form.is_valid())
self.assertIn("has already an approval workflow", form["scopes"].errors[0])
+ def test_clean_edit(self):
+ existing_approval = ApprovalWorkflow.objects.create(name="test",
+ operation=self.create_operation_test,
+ enabled=True)
+ existing_approval.scopes.set([self.test_quota_scope])
+
+ new_approval = ApprovalWorkflow.objects.create(name="test2",
+ operation=self.create_operation_test,
+ enabled=True)
+ data = {
+ 'name': 'test_approval_workflow',
+ 'operation': self.create_operation_test,
+ 'scopes': [self.test_quota_scope]
+ }
+ form = ApprovalWorkflowFormEdit(data, instance=new_approval)
+ self.assertFalse(form.is_valid())
+ self.assertIn("has already an approval workflow", form["scopes"].errors[0])
+
def test_add_scope_to_scopes(self):
existing_approval = ApprovalWorkflow.objects.create(name="test",
operation=self.create_operation_test,
@@ -46,6 +64,24 @@ def test_add_scope_to_scopes(self):
form = ApprovalWorkflowFormEdit(instance=existing_approval, data=data)
self.assertTrue(form.is_valid())
+ def test_clean_edit_with_empty_scopes(self):
+ existing_approval = ApprovalWorkflow.objects.create(name="test",
+ operation=self.create_operation_test,
+ enabled=True)
+
+ new_approval = ApprovalWorkflow.objects.create(name="test2",
+ operation=self.create_operation_test,
+ enabled=True)
+ new_approval.scopes.set([self.test_quota_scope])
+
+ data = {
+ 'name': 'test_approval_workflow',
+ 'operation': self.create_operation_test
+ }
+ form = ApprovalWorkflowFormEdit(data, instance=new_approval)
+ self.assertFalse(form.is_valid())
+ self.assertIn("An approval workflow for all scopes already exists", form["scopes"].errors[0])
+
def test_clean_with_empty_scopes(self):
existing_approval = ApprovalWorkflow.objects.create(name="test",
operation=self.create_operation_test,
diff --git a/tests/test_service_catalog/test_urls/test_approvalworkflow.py b/tests/test_service_catalog/test_urls/test_approvalworkflow.py
index 306e6c857..54493f532 100644
--- a/tests/test_service_catalog/test_urls/test_approvalworkflow.py
+++ b/tests/test_service_catalog/test_urls/test_approvalworkflow.py
@@ -41,6 +41,11 @@ def test_approvalworkflow_views(self):
perm_str='service_catalog.change_approvalworkflow',
url_kwargs={'pk': self.approval_workflow.id}
),
+ TestingGetContextView(
+ url='service_catalog:approvalworkflow_preview',
+ perm_str='service_catalog.view_approvalworkflow',
+ url_kwargs={'pk': self.approval_workflow.id, 'scope_id': self.test_quota_scope.id}
+ ),
TestingPostContextView(
url='service_catalog:approvalworkflow_edit',
perm_str='service_catalog.change_approvalworkflow',
diff --git a/tests/test_service_catalog/test_views/test_common/test_doc_view.py b/tests/test_service_catalog/test_views/test_common/test_doc_view.py
index 23dfa0f9a..08e8d6cab 100644
--- a/tests/test_service_catalog/test_views/test_common/test_doc_view.py
+++ b/tests/test_service_catalog/test_views/test_common/test_doc_view.py
@@ -11,7 +11,10 @@ def setUp(self):
self.client.login(username=self.standard_user, password=self.common_password)
self.new_doc = Doc.objects.create(title="test_doc", content="# tittle 1")
- self.new_doc.services.add(self.service_test)
+ self.new_doc_on_service = Doc.objects.create(title="test_doc_service", content="Service")
+ self.new_doc_on_service.services.add(self.service_test)
+ self.new_doc_on_operation = Doc.objects.create(title="test_doc_operation", content="Operation")
+ self.new_doc_on_operation.operations.add(self.create_operation_test_2)
def _test_can_list_doc(self):
url = reverse('service_catalog:doc_list')
-
-
- - ID{{ object.id }} - -
- - Name{{ object.name }} - -
- - Hash{{ object.hash | to_hexa }} - -
- - Operation - {{ object.operation.name }} - +
- + ID{{ object.id }} + +
- + Name{{ object.name }} + +
- + Hash{{ object.hash | to_hexa }} + +
- + Operation + {{ object.operation.name }} + +
- + Enabled + {{ object.enabled | display_boolean }} + + {% if object.scopes.all %}
- - Enabled - {{ object.enabled | display_boolean }} - - {% if object.scopes.all %} -
- - Restricted scopes - + Restricted scopes + {% for scope in object.scopes.distinct %} {{ scope }} {% endfor %} - - {% endif %} - {% if object.get_unused_fields %} -
- + + {% endif %} + {% if object.get_unused_fields %} +
- Unused required fields - + {% for field in object.get_unused_fields %} {{ field }} {% endfor %} - - {% endif %} - -
- Permission -
- {{ approval_step.permission }} +
- Permission +
- {{ approval_step.permission }} -
- Read survey fields -
- - {% for field in approval_step.readable_fields.all %} - {{ field.name }} - {% endfor %} - +
- Read survey fields +
- + {% for field in approval_step.readable_fields.all %} + {{ field.name }} + {% endfor %} + -
- Write survey fields -
- - {% for field in approval_step.editable_fields.all %} - {{ field.name }} - {% endfor %} - - {% if approval_step.auto_accept_condition %} -
- Auto accept condition -
- {{ approval_step.auto_accept_condition }} - {% endif %} -
- Write survey fields +
- + {% for field in approval_step.editable_fields.all %} + {{ field.name }} + {% endfor %} + + {% if approval_step.auto_accept_condition %} +
- Auto accept condition +
- {{ approval_step.auto_accept_condition }} + {% endif %} +
- Permission +
- + {{ approval_step.permission.permission_str }} + +
- Related roles +
-
+ {% for role in approval_step.permission.role_set.all %}
+ {{ role.name }}
+ {% empty %} + No related roles, create a role first. + {% endfor %} +
+ - Read survey fields +
- + {% for field in approval_step.readable_fields.all %} + {{ field.name }} + {% endfor %} + +
- Write survey fields +
- + {% for field in approval_step.editable_fields.all %} + {{ field.name }} + {% endfor %} + + {% if approval_step.auto_accept_condition %} +
- Auto accept condition +
- {{ approval_step.auto_accept_condition }} + {% endif %} +
- Approvers + +
- + {% who_can_approve_on_scope approval_step scope as list_who_can_approve %} + {% if list_who_can_approve.all %} + {{ list_who_can_approve|join:", " }} + {% else %} + No + approvers + {% endif %} + +
- + ID + {{ object.id }} + +
-
Service
{% has_perm request.user "service_catalog.change_service" object.service as can_edit_service %}
diff --git a/templates/service_catalog/operation_detail.html b/templates/service_catalog/operation_detail.html
index 7c21b0a35..b09f108da 100644
--- a/templates/service_catalog/operation_detail.html
+++ b/templates/service_catalog/operation_detail.html
@@ -42,6 +42,23 @@
Details
{{ object.enabled | display_boolean }} -
+ Docs
+ {% for doc in object.docs.all %}
+
+ {{ doc.title }}
+
+ {% endfor %} +
+ -
+ Validators
+ {% for validator in object.validators_name %}
+
+ {{ validator }}
+
+ {% endfor %} + -
+ Docs
+ {% for doc in object.docs.all %}
+
+ {{ doc.title }}
+
+ {% endfor %} +
+
@@ -55,6 +56,15 @@
+
+
-
-
diff --git a/templates/service_catalog/service_detail.html b/templates/service_catalog/service_detail.html
index 127addd85..f89a55054 100644
--- a/templates/service_catalog/service_detail.html
+++ b/templates/service_catalog/service_detail.html
@@ -26,6 +26,7 @@
+
-
+
+ {{ object.name }}
+
+
- -
+
-
-
-
-
-
+
-
+
-
+
+
-
-
+
-
+
+ Drag and drop steps to reorganize the order
-
+
{% endblock %}
{% block custom_script %}
diff --git a/templates/service_catalog/approvalworkflow_preview.html b/templates/service_catalog/approvalworkflow_preview.html
new file mode 100644
index 000000000..a63ca4611
--- /dev/null
+++ b/templates/service_catalog/approvalworkflow_preview.html
@@ -0,0 +1,129 @@
+{% extends 'base.html' %}
+{% block title %}
+ #{{ object.id }} | Approval Workflow for {{ scope }}
+{% endblock %}
+{% load render_table from django_tables2 %}
+{% load static %}
+
+{% block main %}
+
+
+
+
+
+
+
+
+
+
+
-
- Add a step
-
+
-
-
+
- Drag and drop steps to reorganize the order
- {% for approval_step in object.approval_steps.all|dictsort:"position" %}
-
-
-
+
+
-
+ {% for approval_step in object.approval_steps.all|dictsort:"position" %}
+
+ {% empty %}
+
+
+
+
- {% endfor %}
- {{ approval_step.name }}
+ -
-
+ -
-
+
+ -
+
+ No steps in the workflow
+
+ {% endfor %}
-
+
- Requests currently using workflow
-
- {% render_table request_table %}
+
+
+
+ Requests currently using workflow
+ {% render_table request_table %}
+
+
+ Preview your workflow on your Organization/Team
+
+ {% render_table scope_table %}
+
+{% endblock %}
+{% block custom_script %}
+
+
+{% endblock %}
diff --git a/templates/service_catalog/custom_columns/doc_actions.html b/templates/service_catalog/custom_columns/doc_actions.html
deleted file mode 100644
index 5afac3ee4..000000000
--- a/templates/service_catalog/custom_columns/doc_actions.html
+++ /dev/null
@@ -1,3 +0,0 @@
-
- Open
-
\ No newline at end of file
diff --git a/templates/service_catalog/custom_columns/doc_operations.html b/templates/service_catalog/custom_columns/doc_operations.html
deleted file mode 100644
index a9c7496e8..000000000
--- a/templates/service_catalog/custom_columns/doc_operations.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for operation in record.operations.all %}
- {{ operation.name }} ({{ operation.service.name }})
-{% endfor %}
diff --git a/templates/service_catalog/custom_columns/doc_services.html b/templates/service_catalog/custom_columns/doc_services.html
deleted file mode 100644
index d8c32b419..000000000
--- a/templates/service_catalog/custom_columns/doc_services.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for service in record.services.all %}
- {{ service.name }}
-{% endfor %}
\ No newline at end of file
diff --git a/templates/service_catalog/custom_columns/preview_workflow.html b/templates/service_catalog/custom_columns/preview_workflow.html
new file mode 100644
index 000000000..af21ef15c
--- /dev/null
+++ b/templates/service_catalog/custom_columns/preview_workflow.html
@@ -0,0 +1,3 @@
+
+ Preview
+
diff --git a/templates/service_catalog/custom_columns/service_operations.html b/templates/service_catalog/custom_columns/service_operations.html
index 1a7c35038..b2181ecb0 100644
--- a/templates/service_catalog/custom_columns/service_operations.html
+++ b/templates/service_catalog/custom_columns/service_operations.html
@@ -1,3 +1,3 @@
-
+
{{ record.operations.count }}
\ No newline at end of file
diff --git a/templates/service_catalog/instance_detail.html b/templates/service_catalog/instance_detail.html
index 5a827f82f..371573e1c 100644
--- a/templates/service_catalog/instance_detail.html
+++ b/templates/service_catalog/instance_detail.html
@@ -35,6 +35,11 @@
+
+
+
+
+
+
+ {% if current_workflow.id != object.id %}
+
+
+ {% if current_workflow %}
+ {{ scope }} doesn't use this
+ workflow. {{ scope }} use {{ current_workflow }} to
+ handle {{ object.operation }}.
+ {% else %}
+ {{ scope }} doesn't use workflow for {{ object.operation }}
+ {% endif %}
+
+
+ {% endif %}
+
+ Example of workflow {{ object }} when requesting {{ object.operation }} for
+ {{ scope }}.
+ +
+
+ + +
+ {% for approval_step in object.approval_steps.all %}
+
+
+
+ {% empty %}
+
+
+ {{ approval_step.name }}
+
+
+
+ -
+
+ No steps in the workflow
+
+
+ {% endfor %}
+ {{ object.name }}
alt="Service image">-
+
{{ object.name }}