diff --git a/web/analysis/templatetags/analysis_tags.py b/web/analysis/templatetags/analysis_tags.py index 0af931c41df..e35bccf5edf 100644 --- a/web/analysis/templatetags/analysis_tags.py +++ b/web/analysis/templatetags/analysis_tags.py @@ -45,7 +45,8 @@ def mongo_id(value): """ if isinstance(value, dict): if "_id" in value: - value = value["_id"] + return str(value.get("_id", "")) + return "" # Return value return str(value) diff --git a/web/templates/analysis/admin/index.html b/web/templates/analysis/admin/index.html index 557aed9153a..e03beab96d4 100644 --- a/web/templates/analysis/admin/index.html +++ b/web/templates/analysis/admin/index.html @@ -1,99 +1,108 @@ {% load analysis_tags %}
-
+
Admin Information
+ CAPE {{analysis.info.version}}
-
- -
-
- Task ID -
-
- {{analysis.info.id}} - - Delete Task - -
-
+
+
+ +
+
Task Metadata
+ +
+
+ Task ID +
+
+ {{analysis.info.id}} +
+
- - {% if config.mongodb %} -
-
- Mongo ID -
-
- {{analysis|mongo_id}} -
-
- {% elif config.elasticsearchdb %} -
-
- ElasticSearch Index -
-
- {{analysis.es.index}} -
-
-
-
- ElasticSearch ID -
-
- {{analysis.es.id}} -
-
- {% endif %} + {% if config.mongodb %} +
+
+ Mongo ID +
+
+ {{analysis|mongo_id}} +
+
+ {% elif config.elasticsearchdb %} +
+
+ ES Index +
+
+ {{analysis.es.index}} +
+
+
+
+ ES ID +
+
+ {{analysis.es.id}} +
+
+ {% endif %} - -
-
- CAPE Release -
-
- {{analysis.info.version}} + {% if analysis.info.user_id %} +
+
+ Created By +
+
+ + User ID: {{analysis.info.user_id}} + +
+
+ {% endif %}
-
- - {% if analysis.info.user_id %} -
-
- Created By -
-
-
- +
+ + +
+
Administrative Actions
+ +
+ - User ID: {{analysis.info.user_id}} + title="Delete this task permanently" + onclick="return confirm('Are you sure you want to delete this task? This action cannot be undone.');"> + Delete Task - -
- - Ban User - - - Ban All Tasks - + + {% if analysis.info.user_id %} +
+ User Controls
+ + + Ban User + + + + Ban All Tasks + + {% endif %}
- {% endif %}
\ No newline at end of file