Skip to content

Commit 8df8d24

Browse files
dogboatdogboat
committed
eng view updates
1 parent 44d4800 commit 8df8d24

2 files changed

Lines changed: 27 additions & 9 deletions

File tree

‎dojo/templates/dojo/view_eng.html‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,9 @@ <h3 class="panel-title"><span class="fa-solid fa-server" aria-hidden="true"></sp
894894
<td>
895895
{% if eng.cicd_orchestration_engine %}
896896
<a href="{% url 'edit_cicd_infrastructure' eng.cicd_orchestration_engine.id %}">{{ eng.cicd_orchestration_engine.name }}</a>
897+
{% if eng.cicd_orchestration_engine.url %}
898+
<a target="_blank" href="{{ eng.cicd_orchestration_engine.url }}" data-toggle="tooltip" title="{{ eng.cicd_orchestration_engine.url }}"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
899+
{% endif %}
897900
{% else %}
898901
{{ eng.cicd_orchestration_engine|notspecified }}
899902
{% endif %}
@@ -904,6 +907,9 @@ <h3 class="panel-title"><span class="fa-solid fa-server" aria-hidden="true"></sp
904907
<td>
905908
{% if eng.cicd_scm_server %}
906909
<a href="{% url 'edit_cicd_infrastructure' eng.cicd_scm_server.id %}">{{ eng.cicd_scm_server.name }}</a>
910+
{% if eng.cicd_scm_server.url %}
911+
<a target="_blank" href="{{ eng.cicd_scm_server.url }}" data-toggle="tooltip" title="{{ eng.cicd_scm_server.url }}"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
912+
{% endif %}
907913
{% else %}
908914
{{ eng.cicd_scm_server|notspecified }}
909915
{% endif %}
@@ -914,6 +920,9 @@ <h3 class="panel-title"><span class="fa-solid fa-server" aria-hidden="true"></sp
914920
<td>
915921
{% if eng.cicd_build_server %}
916922
<a href="{% url 'edit_cicd_infrastructure' eng.cicd_build_server.id %}">{{ eng.cicd_build_server.name }}</a>
923+
{% if eng.cicd_build_server.url %}
924+
<a target="_blank" href="{{ eng.cicd_build_server.url }}" data-toggle="tooltip" title="{{ eng.cicd_build_server.url }}"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
925+
{% endif %}
917926
{% else %}
918927
{{ eng.cicd_build_server|notspecified }}
919928
{% endif %}

‎dojo/templates_classic/dojo/view_eng.html‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -894,30 +894,39 @@ <h3 class="panel-title"><span class="fa-solid fa-server" aria-hidden="true"></sp
894894
<tr>
895895
<td><strong>Orchestration</strong></td>
896896
<td>
897-
{% if eng.orchestration_engine.id %}
898-
<a href="{% url 'edit_tool_config' eng.orchestration_engine.id %}">{{ eng.orchestration_engine.name }}</a>
897+
{% if eng.cicd_orchestration_engine.id %}
898+
<a href="{% url 'edit_cicd_infrastructure' eng.cicd_orchestration_engine.id %}">{{ eng.cicd_orchestration_engine.name }}</a>
899+
{% if eng.cicd_orchestration_engine.url %}
900+
<a target="_blank" href="{{ eng.cicd_orchestration_engine.url }}" data-toggle="tooltip" title="{{ eng.cicd_orchestration_engine.url }}"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
901+
{% endif %}
899902
{% else %}
900-
{{ eng.orchestration_engine.name|notspecified }}
903+
{{ eng.cicd_orchestration_engine.name|notspecified }}
901904
{% endif %}
902905
</td>
903906
</tr>
904907
<tr>
905908
<td><strong>SCM Server</strong></td>
906909
<td>
907-
{% if eng.source_code_management_server.id %}
908-
<a href="{% url 'edit_tool_config' eng.source_code_management_server.id %}">{{ eng.source_code_management_server.name }}</a>
910+
{% if eng.cicd_scm_server.id %}
911+
<a href="{% url 'edit_cicd_infrastructure' eng.cicd_scm_server.id %}">{{ eng.cicd_scm_server.name }}</a>
912+
{% if eng.cicd_scm_server.url %}
913+
<a target="_blank" href="{{ eng.cicd_scm_server.url }}" data-toggle="tooltip" title="{{ eng.cicd_scm_server.url }}"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
914+
{% endif %}
909915
{% else %}
910-
{{ eng.source_code_management_server.name|notspecified }}
916+
{{ eng.cicd_scm_server.name|notspecified }}
911917
{% endif %}
912918
</td>
913919
</tr>
914920
<tr>
915921
<td><strong>Build Server</strong></td>
916922
<td>
917-
{% if eng.build_server.id %}
918-
<a href="{% url 'edit_tool_config' eng.build_server.id %}">{{ eng.build_server.name }}</a>
923+
{% if eng.cicd_build_server.id %}
924+
<a href="{% url 'edit_cicd_infrastructure' eng.cicd_build_server.id %}">{{ eng.cicd_build_server.name }}</a>
925+
{% if eng.cicd_build_server.url %}
926+
<a target="_blank" href="{{ eng.cicd_build_server.url }}" data-toggle="tooltip" title="{{ eng.cicd_build_server.url }}"><i class="fa-solid fa-arrow-up-right-from-square"></i></a>
927+
{% endif %}
919928
{% else %}
920-
{{ eng.build_server.name|notspecified }}
929+
{{ eng.cicd_build_server.name|notspecified }}
921930
{% endif %}
922931
</td>
923932
</tr>

0 commit comments

Comments
 (0)