Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/ooi detail fixes #4024

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Fix/ooi detail fixes #4024

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
27a0709
small cleanups on ooi detail page
underdarknl Jan 13, 2025
bc8957f
extra cleanups / make things more useful
underdarknl Jan 13, 2025
5d8e847
typo
underdarknl Jan 13, 2025
0d1d935
Merge branch 'main' into fix/ooi_detail_fixes
stephanie0x00 Jan 15, 2025
c5b92b9
Update rocky/rocky/templates/partials/ooi_detail_related_object.html
underdarknl Jan 17, 2025
bca82ec
Update ooi_detail_task_list.html
underdarknl Jan 17, 2025
ceed326
Merge branch 'main' into fix/ooi_detail_fixes
underdarknl Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions rocky/rocky/templates/oois/ooi_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
{% include "tasks/ooi_detail_task_list.html" %}

</div>
<div>
{% if not ooi|is_finding and not ooi|is_finding_type %}
{% if not ooi|is_finding and not ooi|is_finding_type %}
<div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this fix (somewhere ish) is intended to ensure that the warning popups are not in multiple columns. This only happens for objects with L0 clearance.

image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it was meant to remove an empty div if there would be no content.
I'm not sure why the screenshotted widget looks the way it does.

{% include "oois/ooi_detail_findings_overview.html" with severity_summary=findings_severity_summary severity_summary_totals=severity_summary_totals %}

{% endif %}
</div>
</div>
{% endif %}
<div>
<h2>{% translate "Scan" %} {{ ooi.human_readable }} {% translate "using boefjes" %}</h2>
<h2>{% translate "Scan" %} {% translate "using boefjes" %}</h2>
{% if enabled_boefjes_available %}
<div class="horizontal-view">
<div>
Expand Down
11 changes: 7 additions & 4 deletions rocky/rocky/templates/oois/ooi_detail_origins_inference.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@ <h2>{% translate "Inferred by" %}</h2>
<a href="{% ooi_url 'ooi_detail' inference.origin.source organization.code %}">{{ inference.origin.source }}</a>
</td>
<td>
{% for param in params %}
<a href="{% ooi_url 'ooi_detail' param.reference organization.code %}">{{ param.reference }}</a>
<br>
{% endfor %}
<ul>
{% for param in params %}
<li>
<a href="{% ooi_url 'ooi_detail' param.reference organization.code %}">{{ param.reference }}</a>
</li>
{% endfor %}
</ul>
</td>
</tr>
{% endfor %}
Expand Down
12 changes: 5 additions & 7 deletions rocky/rocky/templates/partials/ooi_detail_related_object.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,13 @@
<div class="horizontal-scroll">
<h2>{% translate "Related objects" %}</h2>
{% if not related %}
<p>
{% translate "No related objects added to" %} {{ ooi.get_ooi_type }}.
<br>
{% translate "Use the button below to add a related object." %}
</p>
<p>{% translate "No related object known for" %} {{ ooi.get_ooi_type }}.</p>
{% endif %}
{% if not ooi_past_due %}
{% if not ooi|is_finding and not ooi|is_finding_type %}
<div class="horizontal-view {% if related %}toolbar{% endif %}">
<a href="{% ooi_url "ooi_add_related" ooi.primary_key organization.code %}"
class="button ghost">{% translate "Add" %}</a>
class="button ghost">{% translate "Add related" %}</a>
underdarknl marked this conversation as resolved.
Show resolved Hide resolved
</div>
{% endif %}
{% endif %}
Expand All @@ -32,7 +28,9 @@ <h2>{% translate "Related objects" %}</h2>
<td>
<a href="{% ooi_url "ooi_detail" related_ooi.reference organization.code query=related_ooi.mandatory_fields %}">{{ related_ooi.reference.human_readable }}</a>
</td>
<td>{{ related_ooi.name }}</td>
<td>
<a href="{% url "ooi_list" organization.code %}?ooi_type={{ related_ooi.reference.class_ }}">{{ related_ooi.reference.class_ }}</a>
</td>
</tr>
{% endfor %}
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions rocky/rocky/templates/tasks/ooi_detail_task_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<h2>{% translate "Tasks" %}</h2>
{% ooi_url 'ooi_detail' ooi.primary_key organization.code query=mandatory_fields as this_url %}
{% if not task_list %}
<p class="emphasized">{% translate "There are no tasks for" %} {{ ooi }}</p>
<p class="emphasized">{% translate "There have been no tasks" %}</p>
{% include "tasks/partials/task_filter.html" with clear_filter_url=this_url %}

{% else %}
<p class="emphasized">{% translate "List of tasks for" %} {{ ooi }}</p>
<p class="emphasized">{% translate "List of tasks" %}</p>
underdarknl marked this conversation as resolved.
Show resolved Hide resolved
{% include "tasks/partials/task_filter.html" with clear_filter_url=this_url %}

<table rf-selector="table-scan-history">
Expand Down
Loading