bruno/flowdeck
1
1
Fork 0
Code Issues 9 Pull Requests Actions 2 Packages Projects 1 Releases 20 Wiki Activity

fix: panneau Share affiche les noms d'utilisateurs + tree local-workspace indique is_shared pour tous les modes de partage

Browse Source
This commit is contained in:
bruno
2026-09-08 12:25:12 -04:00
parent 15cc2d6f21
commit d40fdcafe3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/routers/dashboard.py
+4 -2
View File
@@ -1024,7 +1024,8 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
if parent_id is None: if parent_id is None:
rows = conn.execute( rows = conn.execute(
"SELECT id, title, parent_section, content_format, content, " "SELECT id, title, parent_section, content_format, content, "
"is_shared, created_at, updated_at FROM pages " "(is_shared OR share_mode != 'private' OR COALESCE(published,0)) as is_shared, "
"created_at, updated_at FROM pages "
"WHERE parent_id IS NULL AND workspace_id=? AND deleted_at IS NULL " "WHERE parent_id IS NULL AND workspace_id=? AND deleted_at IS NULL "
"ORDER BY created_at DESC", "ORDER BY created_at DESC",
(ws_id,), (ws_id,),
@@ -1032,7 +1033,8 @@ def _build_tree_children(conn, parent_id: int | None, ws_id: int) -> list:
else: else:
rows = conn.execute( rows = conn.execute(
"SELECT id, title, parent_section, content_format, content, " "SELECT id, title, parent_section, content_format, content, "
"is_shared, created_at, updated_at FROM pages " "(is_shared OR share_mode != 'private' OR COALESCE(published,0)) as is_shared, "
"created_at, updated_at FROM pages "
"WHERE parent_id=? AND workspace_id=? AND deleted_at IS NULL " "WHERE parent_id=? AND workspace_id=? AND deleted_at IS NULL "
"ORDER BY created_at DESC", "ORDER BY created_at DESC",
(parent_id, ws_id), (parent_id, ws_id),
app/templates/_page_editor_content.html
+9 -7
View File
@@ -102,22 +102,24 @@
<!-- Participants list --> <!-- Participants list -->
<div class="sd-participants" x-show="accessList.length"> <div class="sd-participants" x-show="accessList.length">
<template x-for="a in accessList" :key="a.email"> <template x-for="a in accessList" :key="a.id">
{% raw %} {% raw %}
<div class="sd-participant"> <div class="sd-participant">
<div class="sd-participant-info"> <div class="sd-participant-info">
<div <div class="sd-avatar" x-show="a.user_avatar_url" style="overflow:hidden">
class="sd-avatar" <img :src="a.user_avatar_url" style="width:100%;height:100%;border-radius:50%;object-fit:cover;" />
x-text="a.email[0].toUpperCase()" </div>
<div class="sd-avatar" x-show="!a.user_avatar_url"
x-text="(a.user_full_name || a.user_login || a.shared_with_email || '?')[0].toUpperCase()"
></div> ></div>
<div> <div>
<div <div
class="sd-participant-name" class="sd-participant-name"
x-text="a.email" x-text="a.user_full_name || a.user_login || a.shared_with_email"
></div> ></div>
<div <div
class="sd-participant-email" class="sd-participant-email"
x-text="a.email" x-text="a.shared_with_email || a.user_login || ''"
></div> ></div>
</div> </div>
</div> </div>
@@ -168,7 +170,7 @@
<div class="sd-perm-sep"></div> <div class="sd-perm-sep"></div>
<div <div
class="sd-perm-option danger" class="sd-perm-option danger"
@click="removeAccess(a.email); a.permOpen=false" @click="removeShare(a.id); a.permOpen=false"
> >
Remove Remove
</div> </div>