Skip to content

Commit

Permalink
Merge pull request DefectDojo#7893 from DefectDojo/master-into-dev/2.…
Browse files Browse the repository at this point in the history 
…20.3-2.21.0-dev

Release: Merge back 2.20.3 into dev from: master-into-dev/2.20.3-2.21.0-dev
  • Loading branch information
@Maffooch
Maffooch authored Mar 27, 2023
2 parents 873b7e4 + 4049f0b commit f072de6
Show file tree
Hide file tree
Showing 32 changed files with 97 additions and 79 deletions.
36 changes: 18 additions & 18 deletions dojo/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
{% trans "Risk Accepted Findings" %}
</a>
</li>
{% if "dojo.view_finding_template"|has_configuration_permission %}
{% if "dojo.view_finding_template"|has_configuration_permission:request %}
<li>
<a href="{% url 'templates' %}">
{% trans "Finding Templates" %}
Expand Down Expand Up @@ -426,22 +426,22 @@
</ul>
<!-- /.nav-second-level -->
</li>
{% if "auth.view_user"|has_configuration_permission or "auth.view_group"|has_configuration_permission %}
{% if "auth.view_user"|has_configuration_permission:request or "auth.view_group"|has_configuration_permission:request %}
<li>
<a href="{% url 'users' %}" aria-disabled="true" aria-expanded="false" aria-label="Users" id="id_user_menu">
<i class="fa-solid fa-user fa-fw"></i>
<span>{% trans "Users" %}</span>
<span class="glyphicon arrow"></span>
</a>
<ul class="nav nav-second-level">
{% if "auth.view_user"|has_configuration_permission %}
{% if "auth.view_user"|has_configuration_permission:request %}
<li>
<a href="{% url 'users' %}">
{% trans "Users" %}
</a>
</li>
{% endif %}
{% if "auth.view_group"|has_configuration_permission %}
{% if "auth.view_group"|has_configuration_permission:request %}
<li>
<a href="{% url 'groups' %}" id="id_group_menu">
{% trans "Groups" %}
Expand All @@ -460,22 +460,22 @@
</li>
{% endif %}
{% if system_settings.enable_questionnaires %}
{% if "dojo.view_engagement_survey"|has_configuration_permission or "dojo.view_question"|has_configuration_permission %}
{% if "dojo.view_engagement_survey"|has_configuration_permission:request or "dojo.view_question"|has_configuration_permission:request %}
<li>
<a href="#">
<i class="fa-solid fa-house-medical-flag fa-fw"></i>
<span>{% trans "Questionnaires" %}</span>
<span class="glyphicon arrow"></span>
</a>
<ul class="nav nav-second-level">
{% if "dojo.view_engagement_survey"|has_configuration_permission %}
{% if "dojo.view_engagement_survey"|has_configuration_permission:request %}
<li>
<a href="{% url 'questionnaire' %}">
{% trans "All Questionnaires" %}
</a>
</li>
{% endif %}
{% if "dojo.view_question"|has_configuration_permission %}
{% if "dojo.view_question"|has_configuration_permission:request %}
<li>
<a href="{% url 'questions' %}">
{% trans "All Questions" %}
Expand All @@ -493,49 +493,49 @@
<span>{% trans "Configuration" %}</span>
</a>
<ul class="nav nav-second-level">
{% if "dojo.change_announcement"|has_configuration_permission %}
{% if "dojo.change_announcement"|has_configuration_permission:request %}
<li>
<a href="{% url 'configure_announcement' %}">
{% trans "Announcement" %}
</a>
</li>
{% endif %}
{% if system_settings.enable_credentials and "dojo.view_cred_user"|has_configuration_permission %}
{% if system_settings.enable_credentials and "dojo.view_cred_user"|has_configuration_permission:request %}
<li>
<a href="{% url 'cred' %}">
{% trans "Credential Manager" %}
</a>
</li>
{% endif %}
{% if system_settings.enable_github and "dojo.view_github_conf"|has_configuration_permission%}
{% if system_settings.enable_github and "dojo.view_github_conf"|has_configuration_permission:request%}
<li>
<a href="{% url 'github' %}">
{% trans "GitHub" %}
</a>
</li>
{% endif %}
{% if system_settings.enable_google_sheets and "dojo.change_google_sheet"|has_configuration_permission %}
{% if system_settings.enable_google_sheets and "dojo.change_google_sheet"|has_configuration_permission:request %}
<li>
<a href="{% url 'configure_google_sheets' %}">
{% trans "Google Sheets Sync" %}
</a>
</li>
{% endif %}
{% if system_settings.enable_jira and "dojo.view_jira_instance"|has_configuration_permission %}
{% if system_settings.enable_jira and "dojo.view_jira_instance"|has_configuration_permission:request %}
<li>
<a href="{% url 'jira' %}">
{% trans "JIRA" %}
</a>
</li>
{% endif %}
{% if "dojo.change_bannerconf"|has_configuration_permission %}
{% if "dojo.change_bannerconf"|has_configuration_permission:request %}
<li>
<a href="{% url 'configure_banner' %}">
{% trans "Login Banner" %}
</a>
</li>
{% endif %}
{% if "dojo.view_note_type"|has_configuration_permission %}
{% if "dojo.view_note_type"|has_configuration_permission:request %}
<li>
<a href="{% url 'note_type' %}">
{% trans "Note Types" %}
Expand All @@ -552,14 +552,14 @@
{% trans "Regulations" %}
</a>
</li>
{% if system_settings.enable_rules_framework and "dojo.view_rule"|has_configuration_permission %}
{% if system_settings.enable_rules_framework and "dojo.view_rule"|has_configuration_permission:request %}
<li>
<a href="{% url 'rules' %}">
{% trans "Rules Framework" %}
</a>
</li>
{% endif %}
{% if system_settings.enable_finding_sla and "dojo.view_sla_configuration"|has_configuration_permission %}
{% if system_settings.enable_finding_sla and "dojo.view_sla_configuration"|has_configuration_permission:request %}
<li>
<a href="{% url 'sla_config' %}">
{% trans "SLA Configuration" %}
Expand All @@ -573,14 +573,14 @@
</a>
</li>
{% endif %}
{% if "dojo.view_tool_configuration"|has_configuration_permission %}
{% if "dojo.view_tool_configuration"|has_configuration_permission:request %}
<li>
<a href="{% url 'tool_config' %}">
{% trans "Tool Configuration" %}
</a>
</li>
{% endif %}
{% if "dojo.view_tool_type"|has_configuration_permission %}
{% if "dojo.view_tool_type"|has_configuration_permission:request %}
<li>
<a href="{% url 'tool_type' %}">
{% trans "Tool Type" %}
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/defectDojo-engagement-survey/create_questionnaire.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ <h3>Create New Questionnaire</h3>
<input class="btn btn-primary" type="submit" label="create_questionnaire" name="create_questionnaire" value="Update Questionnaire"/>
<input class="btn btn-primary" type="submit" label="add_questions" name="add_questions"
value="Edit Questions"/>
{% if "dojo.delete_engagement_survey"|has_configuration_permission %}
{% if "dojo.delete_engagement_survey"|has_configuration_permission:request %}
<a class="btn btn-danger" href="{% url 'delete_questionnaire' survey.id %}">Delete Questionnaire</a>
{% endif %}
{% else %}
Expand Down
4 changes: 2 additions & 2 deletions dojo/templates/defectDojo-engagement-survey/list_questions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
{% for question in questions %}
<tr>
<td>
{% if "dojo.change_question"|has_configuration_permission %}
{% if "dojo.change_question"|has_configuration_permission:request %}
<a title="{{ question.text }}" href="{% url 'edit_question' question.id %}">{{ question.text }}</a>
{% else %}
{{ question.text }}
Expand All @@ -51,7 +51,7 @@
<div class="col-md-2">
<div class="panel panel-default filters">
{% if filtered.form %}
{% if "dojo.add_question"|has_configuration_permission %}
{% if "dojo.add_question"|has_configuration_permission:request %}
<div class="panel-heading">Actions</div>
<div class="panel-body centered">
<a class="btn btn-sm btn-secondary" href="{% url 'create_question' %}">
Expand Down
8 changes: 4 additions & 4 deletions dojo/templates/defectDojo-engagement-survey/list_surveys.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% for survey in surveys %}
<tr>
<td>
{% if "dojo.change_engagement_survey"|has_configuration_permission %}
{% if "dojo.change_engagement_survey"|has_configuration_permission:request %}
<a title="{{ survey.name }}" href="{% url 'edit_questionnaire' survey.id %}">{{ survey.name }}</a>
{% else %}
{{ survey.name }}
Expand All @@ -47,7 +47,7 @@
<div class="panel panel-default">
<div class="panel-heading">
General Questionnaires
{% if "dojo.add_engagement_survey"|has_configuration_permission %}
{% if "dojo.add_engagement_survey"|has_configuration_permission:request %}
<a title="Add Questionnaire" class="pull-right btn btn-sm btn-primary" href="/empty_questionnaire"><span class="fa-solid fa-plus"></span></a>
{% endif %}
</div>
Expand Down Expand Up @@ -76,7 +76,7 @@
data-whatever="/empty_questionnaire/{{ survey.id }}/answer">
<i class="fa-solid fa-share"></i> Share Questionnaire
</button>
{% if "dojo.delete_engagement_survey"|has_configuration_permission %}
{% if "dojo.delete_engagement_survey"|has_configuration_permission:request %}
<a class="btn btn-sm btn-danger"
href="general_questionnaire/{{ survey.id }}/delete"> Delete
Questionnaire </a>
Expand All @@ -98,7 +98,7 @@
<div class="col-md-2">
<div class="panel panel-default filters">
{% if filtered.form %}
{% if "dojo.add_engagement_survey"|has_configuration_permission %}
{% if "dojo.add_engagement_survey"|has_configuration_permission:request %}
<div class="panel-heading">Actions</div>
<div class="panel-body centered">
<a class="btn btn-sm btn-secondary" href="{% url 'create_questionnaire' %}">
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/dashboard.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
</div>
{% endblock %}
{% block surveys %}
{% if system_settings.enable_questionnaires and "dojo.view_engagement_survey"|has_configuration_permission %}
{% if system_settings.enable_questionnaires and "dojo.view_engagement_survey"|has_configuration_permission:request %}
<div class="row">
<div class="col-lg-12">
<div class="panel panel-default">
Expand Down
4 changes: 2 additions & 2 deletions dojo/templates/dojo/dev_env.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h3 class="has-filters">
Environment List
<div class="dropdown pull-right">
<button id="show-filters" data-toggle="collapse" data-target="#the-filters" class="btn btn-primary toggle-filters"> <i class="fa-solid fa-filter"></i> <i class="caret"></i> </button>
{% if "dojo.add_development_environment"|has_configuration_permission %}
{% if "dojo.add_development_environment"|has_configuration_permission:request %}
<button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenu1"
data-toggle="dropdown" aria-expanded="true">
<span class="fa-solid fa-screwdriver-wrench"></span>
Expand Down Expand Up @@ -47,7 +47,7 @@ <h3 class="has-filters">
<tbody>
{% for de in devs %}
<tr>
{% if "dojo.change_development_environment"|has_configuration_permission %}
{% if "dojo.change_development_environment"|has_configuration_permission:request %}
<td><a href="{% url 'edit_dev_env' de.id %}"> {{ de.name }} </a></td>
{% else %}
<td> {{ de.name }} </a> </td>
Expand Down
2 changes: 1 addition & 1 deletion dojo/templates/dojo/edit_dev_env.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ <h3> Edit Environment {{ pt.name }}</h3>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<input class="btn btn-primary" name="edit_dev_env" type="submit" value="Submit"/>
{% if "dojo.delete_development_environment"|has_configuration_permission %}
{% if "dojo.delete_development_environment"|has_configuration_permission:request %}
<input class="btn btn-danger" name="delete_dev_env" type="submit" value="Delete"/>
{% endif %}
</div>
Expand Down
Loading

0 comments on commit f072de6

Please sign in to comment.