Skip to content

fix: Don't show reorder UI fixtures unless user can reorder #4785

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

Merged
rjsparks merged 2 commits into from
Nov 28, 2022
Merged

fix: Don't show reorder UI fixtures unless user can reorder #4785

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
334c8a5
fix: Don't show reorder UI fixtures unless user can reorder
larseggert Nov 23, 2022
d08b8b6
Merge branch 'main' into fix-4773
rjsparks Nov 23, 2022
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
4 changes: 2 additions & 2 deletions ietf/templates/meeting/session_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{% load origin ietf_filters static %}
{% block title %}{{ meeting }} : {{ acronym }}{% endblock %}
{% block morecss %}
.slides tr {
cursor:pointer;
.draggable {
cursor: pointer;
}
{% endblock %}
{% block content %}
Expand Down
39 changes: 22 additions & 17 deletions ietf/templates/meeting/session_details_panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,22 +66,20 @@ <h3 class="mt-4">Agenda, Minutes, and Bluesheets</h3>
<td>
<a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
<a href="{{ url }}">({{ pres.document.name }})</a>
</td>
<td class="text-end">
{% if user|has_role:"Secretariat" or can_manage_materials %}
{% if pres.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}

@rjsparks rjsparks Nov 23, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why did this block move?

@larseggert larseggert Nov 24, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

So the float-end looks better.

@rjsparks rjsparks Dec 9, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I don't see, at this point, how the float-end could have been affected?

{% if pres.document.type.slug == 'minutes' %}
<a class="btn btn-primary btn-sm float-end ms-1" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import from notes.ietf.org</a>
{% endif %}
<a class="btn btn-primary btn-sm float-end ms-1" href="{{ upload_url }}">Upload revision</a>
{% endif %}
{% if pres.document.type.slug == 'minutes' %}
{% url 'ietf.meeting.views.upload_session_minutes' session_id=session.pk num=session.meeting.number as upload_url %}
{% elif pres.document.type.slug == 'agenda' %}
{% url 'ietf.meeting.views.upload_session_agenda' session_id=session.pk num=session.meeting.number as upload_url %}
{% else %}
{% url 'ietf.meeting.views.upload_session_bluesheets' session_id=session.pk num=session.meeting.number as upload_url %}
{% endif %}
{% if pres.document.type.slug != 'bluesheets' or user|has_role:"Secretariat" or meeting.type.slug == 'interim' and can_manage_materials %}
{% if pres.document.type.slug == 'minutes' %}
<a class="btn btn-primary btn-sm" href="{% url 'ietf.meeting.views.import_session_minutes' num=session.meeting.number session_id=session.pk %}">Import from notes.ietf.org</a>
{% endif %}
<a class="btn btn-primary btn-sm" href="{{ upload_url }}">Upload revision</a>
{% endif %}
{% endif %}
</td>
</tr>
Expand Down Expand Up @@ -136,24 +134,31 @@ <h3 class="mt-4">Slides</h3>
data-remove-from-session="{% url 'ietf.meeting.views.ajax_remove_slides_from_session' session_id=session.pk num=session.meeting.number %}"
data-reorder-in-session="{% url 'ietf.meeting.views.ajax_reorder_slides_in_session' session_id=session.pk num=session.meeting.number %}">
{% for pres in session.filtered_slides %}
<tr data-name="{{ pres.document.name }}" title="Drag to reorder.">
<tr data-name="{{ pres.document.name }}"
{% if can_manage_materials %}
class="draggable"
title="Drag to reorder."
{% endif %}
>
{% url 'ietf.doc.views_doc.document_main' name=pres.document.name as url %}
<td><i class="bi bi-grip-vertical"></i></td>
{% if can_manage_materials %}
<td>
<i class="bi bi-grip-vertical"></i>
</td>
{% endif %}
<td>
<a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
<a href="{{ url }}">({{ pres.document.name }})</a>
</td>
<td class="text-end">
{% if can_manage_materials %}
<a class="btn btn-primary btn-sm"
<a class="btn btn-primary btn-sm float-end ms-1"
href="{% url 'ietf.meeting.views.upload_session_slides' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
Upload revision
</a>
<a class="btn btn-danger btn-sm"
<a class="btn btn-danger btn-sm float-end ms-1"
href="{% url 'ietf.meeting.views.remove_sessionpresentation' session_id=session.pk num=session.meeting.number name=pres.document.name %}">
Remove
</a>
{% endif %}
<a href="{{ pres.document.get_href }}">{{ pres.document.title }}</a>
<a href="{{ url }}">({{ pres.document.name }})</a>
</td>
</tr>
{% endfor %}
Expand Down Expand Up @@ -206,4 +211,4 @@ <h3 class="mt-4">Drafts</h3>
</a>
{% endif %}
{% endwith %}
{% endfor %}
{% endfor %}