github/datasette
1
0
Fork 0
mirror of https://github.com/simonw/datasette.git synced 2025-12-10 16:51:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

On /-/allowed show reason column if vsible to user

Browse source
This commit is contained in:
Simon Willison 2025-10-25 21:08:59 -07:00
commit ee4fcff5c0
2 changed files with 38 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
datasette/templates/debug_allowed.html
View file

@ -80,6 +80,7 @@ const resultsContent = document.getElementById('results-content');
const resultsCount = document.getElementById('results-count');
const pagination = document.getElementById('pagination');
const submitBtn = document.getElementById('submit-btn');
const hasDebugPermission = {{ 'true' if has_debug_permission else 'false' }};
let currentData = null;
form.addEventListener('submit', async (ev) => {
@ -164,7 +165,9 @@ function displayResults(data) {
html += '<th>Resource Path</th>';
html += '<th>Parent</th>';
html += '<th>Child</th>';
html += '<th>Reason</th>';
if (hasDebugPermission) {
html += '<th>Reason</th>';
}
html += '</tr></thead>';
html += '<tbody>';
@ -173,7 +176,9 @@ function displayResults(data) {
html += `<td><span class="resource-path">${escapeHtml(item.resource || '/')}</span></td>`;
html += `<td>${escapeHtml(item.parent || '—')}</td>`;
html += `<td>${escapeHtml(item.child || '—')}</td>`;
html += `<td>${escapeHtml(item.reason || '—')}</td>`;
if (hasDebugPermission) {
html += `<td>${escapeHtml(item.reason || '—')}</td>`;
}
html += '</tr>';
}

40
datasette/views/special.py
View file

@ -225,6 +225,7 @@ class AllowedResourcesView(BaseView):
request,
{
"supported_actions": sorted_actions,
"has_debug_permission": has_debug_permission,
},
)
@ -262,12 +263,19 @@ class AllowedResourcesView(BaseView):
offset = (page - 1) * page_size
# Use the simplified allowed_resources method
# If user has debug permission, use the with_reasons variant
try:
allowed_resources = await self.ds.allowed_resources(
action=action,
actor=actor,
parent=parent_filter,
)
if has_debug_permission:
allowed_resources = await self.ds.allowed_resources_with_reasons(
action=action,
actor=actor,
)
else:
allowed_resources = await self.ds.allowed_resources(
action=action,
actor=actor,
parent=parent_filter,
)
except Exception:
# If catalog tables don't exist yet, return empty results
headers = {}
@ -287,10 +295,24 @@ class AllowedResourcesView(BaseView):
# Convert to list of dicts with resource path
allowed_rows = []
for resource in allowed_resources:
for item in allowed_resources:
# Extract resource and reason depending on what we got back
if has_debug_permission:
# allowed_resources_with_reasons returns AllowedResource(resource, reason)
resource = item.resource
reason = item.reason
else:
# allowed_resources returns plain Resource objects
resource = item
reason = None
parent_val = resource.parent
child_val = resource.child
# Apply parent filter if needed (when using with_reasons, we need to filter manually)
if parent_filter is not None and parent_val != parent_filter:
continue
# Build resource path
if parent_val is None:
resource_path = "/"
@ -305,9 +327,9 @@ class AllowedResourcesView(BaseView):
"resource": resource_path,
}
# Add debug fields if available
if has_debug_permission and hasattr(resource, "_reason"):
row["reason"] = resource._reason
# Add reason if we have it
if reason is not None:
row["reason"] = reason
allowed_rows.append(row)