logos-co
/
open-law
mirror of https://github.com/logos-co/open-law.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix DnD with permissions

This commit is contained in:
Kostiantyn Stoliarskyi 2023-06-06 15:28:29 +03:00
parent 42137ca8d7
commit bcac809da2
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/static/js/main.js
View File

File diff suppressed because one or more lines are too long

8
app/templates/book/collection_view.html
View File

@ -43,10 +43,10 @@
{% for collection in book.versions[-1].children_collections if not collection.is_root and not collection.is_deleted %}
<div
{% if not collection.active_children and not collection.active_sections %}id="empty-dnd-entity"
{% elif collection.active_children %}data-dnd="dnd-sub-collection"
{% elif collection.active_sections %}id="draggableSectionItems"{% endif %}
{% elif collection.active_children %}{% if has_permission(collection, Access.U) %}data-dnd="dnd-sub-collection"{% endif %}
{% elif collection.active_sections %}{% if has_permission(collection, Access.U) %}id="draggableSectionItems"{% endif %}{% endif %}
data-entity-type="collection"
data-entity-id="{{collection.id}}" class="filter">
data-entity-id="{{collection.id}}" class="filter {% if not has_permission(collection, Access.U) %}denied{% endif %}">
<div data-entity-type="collection"
data-entity-id="{{collection.id}}" class="flex items-center justify-start w-full font-medium text-left text-gray-500 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-800 dark:text-gray-400">
<button class="bg-inherit" type="button" data-accordion-target="#accordion-collapse-body-{{collection.id}}" aria-expanded="true" aria-controls="accordion-collapse-body-{{collection.id}}">
@ -73,7 +73,7 @@
</div>
{% elif collection.active_sections %}
<div id="accordion-collapse-body-{{collection.id}}" class="hidden" aria-labelledby="accordion-collapse-heading-{{collection.id}}" >
<div id="draggableSectionItems" data-entity-id="{{collection.id}}" data-entity-type="collection" data-book-id="{{book.id}}">
<div {% if has_permission(collection, Access.U) %}id="draggableSectionItems"{% endif %} data-entity-id="{{collection.id}}" data-entity-type="collection" data-book-id="{{book.id}}" class="{% if not has_permission(collection, Access.U) %}filter{% endif %}">
{% for section in collection.active_sections %}
{% include 'book/components/section_tab_content.html' %}
{% endfor %}

12
app/templates/book/components/sub_collection_tab_content.html
View File

@ -1,7 +1,7 @@
<!-- prettier-ignore -->
<div
class="ml-6"
data-dnd="dnd-sub-collection"
class="ml-6 {% if not has_permission(collection, Access.U) %}filter{% endif %}"
{% if has_permission(collection, Access.U) %}data-dnd="dnd-sub-collection"{% endif %}
{% if collection %}
data-entity-type="collection"
data-entity-id="{{collection.id}}"
@ -55,14 +55,14 @@
{% if sub_collection.active_children %}
{{recursive_render("book/components/sub_collection_tab_content.html",sub_collection,book)|safe}}
{% elif sub_collection.active_sections %}
<div id="draggableSectionItems" data-entity-id="{{sub_collection.id}}" data-entity-type="sub_collection" data-book-id="{{book.id}}">
<div {% if has_permission(collection, Access.U) %}id="draggableSectionItems"{% endif %} data-entity-id="{{sub_collection.id}}" data-entity-type="sub_collection" data-book-id="{{book.id}}" class="{% if not has_permission(collection, Access.U) %}filter{% endif %}">
<!-- here comes for loop for all section in this sub_collection-->
{% for section in sub_collection.active_sections %}
{% include 'book/components/section_tab_content.html' %}
{% endfor %}
</div>
{% else %}
<div id="empty-dnd-entity" data-entity-type="sub_collection" data-entity-id="{{sub_collection.id}}"></div>
<div id="empty-dnd-entity" data-entity-type="sub_collection" data-entity-id="{{sub_collection.id}}" class="{% if not has_permission(collection, Access.U) %}filter{% endif %}"></div>
{% endif %}
</div>
</div>
@ -71,8 +71,8 @@
{% else %}
<!-- if collection doesn't have sub_collection -->
<div
class="ml-6"
id="draggableSectionItems"
class="ml-6 {% if not has_permission(collection, Access.U) %}filter{% endif %}"
{% if has_permission(collection, Access.U) %}id="draggableSectionItems"{% endif %}
data-entity-id="{{collection.id}}"
data-entity-type="collection">
<!-- here comes for loop for all section in this collection-->

1
src/drag_and_drop.ts
View File

@ -88,6 +88,7 @@ export function initDnD() {
fallbackOnBody: true,
swapThreshold: 20,
filter: '.filter',
disabled: div.classList.contains('denied'),
}),
);
}