latest changes
This commit is contained in:
@@ -4,3 +4,13 @@ from django.apps import AppConfig
|
||||
class ProjectsConfig(AppConfig):
|
||||
default_auto_field = 'django.db.models.BigAutoField'
|
||||
name = 'projects'
|
||||
|
||||
def ready(self):
|
||||
from django.db.models.signals import post_delete
|
||||
from .models import CardAttachment
|
||||
|
||||
def remove_stored_file(sender, instance, **kwargs):
|
||||
if instance.file:
|
||||
instance.file.delete(save=False)
|
||||
|
||||
post_delete.connect(remove_stored_file, sender=CardAttachment, weak=False, dispatch_uid='projects.remove_attachment_file')
|
||||
|
||||
@@ -0,0 +1,102 @@
|
||||
"""Private, card-scoped attachment validation and storage."""
|
||||
import hashlib
|
||||
from pathlib import PurePath
|
||||
from uuid import uuid4
|
||||
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.files.base import ContentFile
|
||||
from django.db import transaction
|
||||
from django.db.models import Sum
|
||||
from django.utils.text import get_valid_filename
|
||||
|
||||
from .models import Activity, Card, CardAttachment, CardComment
|
||||
|
||||
|
||||
TEXT_EXTENSIONS = {'.txt', '.md', '.py', '.js', '.ts', '.tsx', '.jsx', '.json', '.css', '.html', '.xml', '.csv', '.yaml', '.yml', '.sh', '.diff', '.patch'}
|
||||
SIGNATURES = {'.png': (b'\x89PNG\r\n\x1a\n', 'image/png'), '.jpg': (b'\xff\xd8\xff', 'image/jpeg'), '.jpeg': (b'\xff\xd8\xff', 'image/jpeg'), '.webp': (b'RIFF', 'image/webp'), '.pdf': (b'%PDF-', 'application/pdf')}
|
||||
MAX_MCP_BYTES = 2 * 1024 * 1024
|
||||
|
||||
|
||||
def attachment_data(item):
|
||||
return {'id': str(item.pk), 'card_id': str(item.card_id), 'comment_id': item.comment_id,
|
||||
'title': item.title, 'original_filename': item.original_filename,
|
||||
'mime_type': item.mime_type, 'byte_size': item.byte_size, 'sha256': item.sha256,
|
||||
'description': item.description, 'uploaded_by_id': item.uploaded_by_id,
|
||||
'source': item.source, 'source_path': item.source_path, 'source_commit': item.source_commit,
|
||||
'created_at': item.created_at.isoformat()}
|
||||
|
||||
|
||||
def _validated_name(name):
|
||||
# Reject path components rather than silently changing their meaning.
|
||||
if not name or len(name) > 255 or '\\' in name or '/' in name or name in {'.', '..'}:
|
||||
raise ValidationError('Use a filename without a path.')
|
||||
clean = get_valid_filename(name)
|
||||
if not clean or clean.startswith('.'):
|
||||
raise ValidationError('Invalid filename.')
|
||||
return clean
|
||||
|
||||
|
||||
def _detected_type(name, data):
|
||||
suffix = PurePath(name).suffix.lower()
|
||||
if suffix in TEXT_EXTENSIONS:
|
||||
if b'\x00' in data:
|
||||
raise ValidationError('Text files must not contain binary data.')
|
||||
try:
|
||||
data.decode('utf-8')
|
||||
except UnicodeDecodeError:
|
||||
raise ValidationError('Text files must use UTF-8.')
|
||||
return 'text/plain'
|
||||
if suffix in SIGNATURES:
|
||||
signature, mime = SIGNATURES[suffix]
|
||||
if not data.startswith(signature):
|
||||
raise ValidationError('File contents do not match the extension.')
|
||||
if suffix == '.webp' and data[8:12] != b'WEBP':
|
||||
raise ValidationError('Invalid WebP file.')
|
||||
return mime
|
||||
raise ValidationError('Unsupported file type.')
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def upload_attachment(user, card, *, filename, data, comment_id=None, title='', description='', source='web', source_path='', source_commit=''):
|
||||
if len(data) > settings.PROJECTS_ATTACHMENT_MAX_BYTES:
|
||||
raise ValidationError('File exceeds the per-file size limit.')
|
||||
if not data:
|
||||
raise ValidationError('File is empty.')
|
||||
filename = _validated_name(filename)
|
||||
mime = _detected_type(filename, data)
|
||||
if len(title) > 255 or len(description) > 2000 or len(source_path) > 500:
|
||||
raise ValidationError('Attachment metadata is too long.')
|
||||
if source_commit and (len(source_commit) not in (40, 64) or any(c not in '0123456789abcdefABCDEF' for c in source_commit)):
|
||||
raise ValidationError('Source commit must be a Git SHA.')
|
||||
Card.objects.select_for_update().get(pk=card.pk)
|
||||
qs = CardAttachment.objects.filter(card=card)
|
||||
if qs.count() >= settings.PROJECTS_ATTACHMENT_MAX_FILES:
|
||||
raise ValidationError('Card attachment count limit reached.')
|
||||
if (qs.aggregate(total=Sum('byte_size'))['total'] or 0) + len(data) > settings.PROJECTS_ATTACHMENT_MAX_CARD_BYTES:
|
||||
raise ValidationError('Card attachment storage limit reached.')
|
||||
comment = None
|
||||
if comment_id is not None:
|
||||
comment = CardComment.objects.filter(card=card, pk=comment_id).first()
|
||||
if comment is None:
|
||||
raise ValidationError('Progress note does not belong to this card.')
|
||||
item = CardAttachment(card=card, comment=comment, original_filename=filename, title=title.strip() or filename,
|
||||
mime_type=mime, byte_size=len(data), sha256=hashlib.sha256(data).hexdigest(),
|
||||
description=description, uploaded_by=user, source=source,
|
||||
source_path=source_path, source_commit=source_commit)
|
||||
item.file.save(f'{uuid4().hex}{PurePath(filename).suffix.lower()}', ContentFile(data), save=False)
|
||||
try:
|
||||
item.full_clean()
|
||||
item.save()
|
||||
except Exception:
|
||||
item.file.delete(save=False)
|
||||
raise
|
||||
Activity.objects.create(project=card.project, card=card, actor=user, action='attachment.added',
|
||||
detail={'attachment_id': str(item.pk), 'comment_id': comment_id}, origin=source)
|
||||
return item
|
||||
|
||||
|
||||
def delete_attachment(user, item, *, source='web'):
|
||||
Activity.objects.create(project=item.card.project, card=item.card, actor=user, action='attachment.deleted',
|
||||
detail={'attachment_id': str(item.pk), 'comment_id': item.comment_id}, origin=source)
|
||||
item.delete()
|
||||
@@ -0,0 +1,30 @@
|
||||
# Generated by Django 6.1.2 on 2026-10-16 13:59
|
||||
|
||||
import django.db.models.deletion
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('projects', '0003_oauthidentity'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='BulkUpdateKey',
|
||||
fields=[
|
||||
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
|
||||
('key', models.CharField(max_length=128)),
|
||||
('payload_hash', models.CharField(max_length=64)),
|
||||
('result', models.JSONField()),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'constraints': [models.UniqueConstraint(fields=('user', 'key'), name='unique_bulk_update_key')],
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -0,0 +1,41 @@
|
||||
# Generated by Django 6.1.2 on 2026-10-16 20:15
|
||||
|
||||
import django.db.models.deletion
|
||||
import uuid
|
||||
from django.conf import settings
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('projects', '0004_bulkupdatekey'),
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='CardAttachment',
|
||||
fields=[
|
||||
('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
|
||||
('file', models.FileField(upload_to='card-attachments/%Y/%m/')),
|
||||
('original_filename', models.CharField(max_length=255)),
|
||||
('title', models.CharField(max_length=255)),
|
||||
('mime_type', models.CharField(max_length=100)),
|
||||
('byte_size', models.PositiveIntegerField()),
|
||||
('sha256', models.CharField(max_length=64)),
|
||||
('description', models.TextField(blank=True)),
|
||||
('source', models.CharField(default='web', max_length=16)),
|
||||
('source_path', models.CharField(blank=True, max_length=500)),
|
||||
('source_commit', models.CharField(blank=True, max_length=64)),
|
||||
('created_at', models.DateTimeField(auto_now_add=True)),
|
||||
('card', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='projects.card')),
|
||||
('comment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='projects.cardcomment')),
|
||||
('uploaded_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
|
||||
],
|
||||
options={
|
||||
'ordering': ['created_at', 'id'],
|
||||
'indexes': [models.Index(fields=['card', 'comment', 'created_at'], name='projects_ca_card_id_90f14b_idx')],
|
||||
},
|
||||
),
|
||||
]
|
||||
@@ -1,6 +1,7 @@
|
||||
import uuid
|
||||
from django.conf import settings
|
||||
from django.core.validators import RegexValidator
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db import models
|
||||
from django.db.models import Q
|
||||
|
||||
@@ -122,6 +123,32 @@ class CardComment(models.Model):
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
|
||||
class CardAttachment(models.Model):
|
||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||
card = models.ForeignKey(Card, on_delete=models.CASCADE, related_name='attachments')
|
||||
comment = models.ForeignKey(CardComment, null=True, blank=True, on_delete=models.CASCADE, related_name='attachments')
|
||||
file = models.FileField(upload_to='card-attachments/%Y/%m/')
|
||||
original_filename = models.CharField(max_length=255)
|
||||
title = models.CharField(max_length=255)
|
||||
mime_type = models.CharField(max_length=100)
|
||||
byte_size = models.PositiveIntegerField()
|
||||
sha256 = models.CharField(max_length=64)
|
||||
description = models.TextField(blank=True)
|
||||
uploaded_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL)
|
||||
source = models.CharField(max_length=16, default='web')
|
||||
source_path = models.CharField(max_length=500, blank=True)
|
||||
source_commit = models.CharField(max_length=64, blank=True)
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
ordering = ['created_at', 'id']
|
||||
indexes = [models.Index(fields=['card', 'comment', 'created_at'])]
|
||||
|
||||
def clean(self):
|
||||
if self.comment_id and not CardComment.objects.filter(pk=self.comment_id, card_id=self.card_id).exists():
|
||||
raise ValidationError({'comment': 'Progress note must belong to this card.'})
|
||||
|
||||
|
||||
class CreationKey(models.Model):
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
|
||||
key = models.CharField(max_length=128)
|
||||
@@ -133,6 +160,17 @@ class CreationKey(models.Model):
|
||||
constraints = [models.UniqueConstraint(fields=['user', 'key'], name='unique_card_creation_key')]
|
||||
|
||||
|
||||
class BulkUpdateKey(models.Model):
|
||||
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
|
||||
key = models.CharField(max_length=128)
|
||||
payload_hash = models.CharField(max_length=64)
|
||||
result = models.JSONField()
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
|
||||
class Meta:
|
||||
constraints = [models.UniqueConstraint(fields=['user', 'key'], name='unique_bulk_update_key')]
|
||||
|
||||
|
||||
class Activity(models.Model):
|
||||
project = models.ForeignKey(Project, on_delete=models.CASCADE, related_name='activity')
|
||||
card = models.ForeignKey(Card, null=True, blank=True, on_delete=models.CASCADE, related_name='activity')
|
||||
|
||||
+102
-2
@@ -1,5 +1,6 @@
|
||||
import hashlib
|
||||
import json
|
||||
from uuid import UUID
|
||||
from django.core.exceptions import PermissionDenied, ValidationError
|
||||
from django.db import transaction
|
||||
from django.db.models import Q, Max
|
||||
@@ -7,7 +8,7 @@ from django.core.validators import URLValidator
|
||||
from django.shortcuts import get_object_or_404
|
||||
from django.utils import timezone
|
||||
from django.utils.text import slugify
|
||||
from .models import Activity, Board, Card, CardRevision, Column, CreationKey, Membership, Project, Tag
|
||||
from .models import Activity, Board, BulkUpdateKey, Card, CardRevision, Column, CreationKey, Membership, Project, Tag
|
||||
|
||||
|
||||
class RevisionConflict(Exception):
|
||||
@@ -119,12 +120,13 @@ def update_card(user, card, *, expected_revision=None, origin='web', **changes):
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def move_card(user, card, column, position=None, origin='web'):
|
||||
def move_card(user, card, column, position=None, origin='web', record_revision=True):
|
||||
card = Card.objects.select_for_update().get(pk=card.pk)
|
||||
project_for(user, card.project_id, write=True)
|
||||
if column.board.project_id != card.project_id or column.archived:
|
||||
raise ValidationError('Column is not available in this project.')
|
||||
old_column = card.column_id
|
||||
old_position = card.position
|
||||
card.column = column
|
||||
card.completed_at = timezone.now() if column.is_done and not card.completed_at else (None if not column.is_done else card.completed_at)
|
||||
siblings = list(Card.objects.filter(column=column, archived=False).exclude(pk=card.pk).order_by('position', 'created_at'))
|
||||
@@ -133,7 +135,12 @@ def move_card(user, card, column, position=None, origin='web'):
|
||||
for i, item in enumerate(siblings):
|
||||
item.position = i
|
||||
item.save(update_fields=['position'])
|
||||
moved = old_column != column.pk or old_position != card.position
|
||||
if moved and record_revision:
|
||||
card.revision += 1
|
||||
card.save()
|
||||
if moved and record_revision:
|
||||
CardRevision.objects.create(card=card, revision=card.revision, markdown=card.description_markdown, actor=user)
|
||||
Activity.objects.create(project=card.project, card=card, actor=user, action='card.moved', detail={'from': str(old_column), 'to': str(column.pk)}, origin=origin)
|
||||
return card
|
||||
|
||||
@@ -219,3 +226,96 @@ def set_tags(user, card, tags, origin='web'):
|
||||
card.tags.set(tags)
|
||||
Activity.objects.create(project=card.project, card=card, actor=user, action='card.tags_changed', origin=origin)
|
||||
return card
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def bulk_update_cards(user, project, card_ids, expected_revisions, changes, *, dry_run=False, idempotency_key=None, origin='web'):
|
||||
"""Validate the entire batch before writing; every mutation shares one transaction."""
|
||||
project_for(user, project.pk, write=True)
|
||||
if not isinstance(card_ids, list) or not 1 <= len(card_ids) <= 100:
|
||||
raise ValidationError('Select between 1 and 100 cards.')
|
||||
try:
|
||||
ids = [str(UUID(str(value))) for value in card_ids]
|
||||
except (ValueError, TypeError, AttributeError):
|
||||
raise ValidationError('Invalid card ID.')
|
||||
if len(set(ids)) != len(ids):
|
||||
raise ValidationError('Duplicate card IDs are not allowed.')
|
||||
if not isinstance(changes, dict) or not changes or set(changes) - {'column_id', 'priority', 'assignee_id', 'tag_ids'}:
|
||||
raise ValidationError('Supply supported changes: column_id, priority, assignee_id or tag_ids.')
|
||||
if 'priority' in changes and changes['priority'] not in dict(Card.PRIORITY):
|
||||
raise ValidationError('Invalid priority.')
|
||||
payload_hash = hashlib.sha256(json.dumps({'project': str(project.pk), 'ids': ids, 'revisions': expected_revisions, 'changes': changes}, sort_keys=True).encode()).hexdigest()
|
||||
if idempotency_key and not dry_run:
|
||||
if len(idempotency_key) > 128:
|
||||
raise ValidationError('Idempotency key is too long.')
|
||||
user.__class__.objects.select_for_update().get(pk=user.pk)
|
||||
existing = BulkUpdateKey.objects.select_for_update().filter(user=user, key=idempotency_key).first()
|
||||
if existing:
|
||||
if existing.payload_hash != payload_hash:
|
||||
raise ValidationError('Idempotency key was already used with different changes.')
|
||||
return existing.result
|
||||
cards = {str(card.pk): card for card in Card.objects.select_for_update().filter(pk__in=ids, project=project, archived=False).select_related('column')}
|
||||
if len(cards) != len(ids):
|
||||
raise ValidationError('One or more cards are unavailable in this project.')
|
||||
if not isinstance(expected_revisions, dict):
|
||||
raise ValidationError('Expected revisions are required for every card.')
|
||||
conflicts = [{'id': identifier, 'expected': expected_revisions.get(identifier), 'current': cards[identifier].revision}
|
||||
for identifier in ids if expected_revisions.get(identifier) != cards[identifier].revision]
|
||||
if conflicts:
|
||||
raise ValidationError({'revision_conflicts': conflicts})
|
||||
column = None
|
||||
if 'column_id' in changes:
|
||||
try:
|
||||
column = Column.objects.get(pk=UUID(str(changes['column_id'])), board=project.board, archived=False)
|
||||
except (Column.DoesNotExist, ValueError, TypeError):
|
||||
raise ValidationError('Column is not available in this project.')
|
||||
assignee = None
|
||||
if 'assignee_id' in changes and changes['assignee_id'] is not None:
|
||||
try:
|
||||
assignee = user.__class__.objects.get(pk=changes['assignee_id'])
|
||||
except (user.__class__.DoesNotExist, ValueError, TypeError):
|
||||
raise ValidationError('Invalid assignee.')
|
||||
if assignee.pk != project.owner_id and not Membership.objects.filter(project=project, user=assignee).exists():
|
||||
raise ValidationError('Assignee must have access to this project.')
|
||||
tags = None
|
||||
if 'tag_ids' in changes:
|
||||
tag_ids = changes['tag_ids']
|
||||
if not isinstance(tag_ids, list) or any(type(value) is not int for value in tag_ids) or len(tag_ids) != len(set(tag_ids)):
|
||||
raise ValidationError('Tag IDs must be a unique list.')
|
||||
tags = list(Tag.objects.filter(project=project, pk__in=tag_ids))
|
||||
if len(tags) != len(tag_ids):
|
||||
raise ValidationError('Tags must belong to this project.')
|
||||
results = []
|
||||
for identifier in ids:
|
||||
card = cards[identifier]
|
||||
before = {'column_id': str(card.column_id), 'priority': card.priority, 'assignee_id': card.assignee_id,
|
||||
'tag_ids': sorted(card.tags.values_list('pk', flat=True))}
|
||||
after = dict(before)
|
||||
if column is not None: after['column_id'] = str(column.pk)
|
||||
if 'priority' in changes: after['priority'] = changes['priority']
|
||||
if 'assignee_id' in changes: after['assignee_id'] = assignee.pk if assignee else None
|
||||
if tags is not None: after['tag_ids'] = sorted(tag.pk for tag in tags)
|
||||
delta = {field: {'from': before[field], 'to': after[field]} for field in changes if field in before and before[field] != after[field]}
|
||||
results.append({'id': identifier, 'title': card.title, 'revision': card.revision + bool(delta), 'changes': delta, 'changed': bool(delta)})
|
||||
if not dry_run:
|
||||
for result in results:
|
||||
if not result['changed']:
|
||||
continue
|
||||
card = cards[result['id']]
|
||||
delta = result['changes']
|
||||
if 'column_id' in delta:
|
||||
move_card(user, card, column, origin=origin, record_revision=False)
|
||||
card.refresh_from_db()
|
||||
if 'priority' in delta: card.priority = changes['priority']
|
||||
if 'assignee_id' in delta: card.assignee = assignee
|
||||
if 'tag_ids' in delta: card.tags.set(tags)
|
||||
card.revision += 1
|
||||
card.full_clean()
|
||||
card.save()
|
||||
CardRevision.objects.create(card=card, revision=card.revision, markdown=card.description_markdown, actor=user)
|
||||
Activity.objects.create(project=project, card=card, actor=user, action='card.bulk_updated', detail={'changes': delta}, origin=origin)
|
||||
response = {'dry_run': dry_run, 'total': len(ids), 'changed_count': sum(item['changed'] for item in results),
|
||||
'unchanged_count': sum(not item['changed'] for item in results), 'items': results}
|
||||
if idempotency_key and not dry_run:
|
||||
BulkUpdateKey.objects.create(user=user, key=idempotency_key, payload_hash=payload_hash, result=response)
|
||||
return response
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
(() => {
|
||||
for (const form of document.querySelectorAll('[data-attachment-upload]')) {
|
||||
if (form.dataset.ready) continue;
|
||||
form.dataset.ready = '1';
|
||||
const input = form.querySelector('input[type="file"]');
|
||||
const progress = form.querySelector('progress');
|
||||
const status = form.querySelector('[role="status"]');
|
||||
const button = form.querySelector('button[type="submit"], button:not([type])');
|
||||
form.addEventListener('dragover', event => { event.preventDefault(); form.classList.add('border', 'border-primary'); });
|
||||
form.addEventListener('dragleave', () => form.classList.remove('border', 'border-primary'));
|
||||
form.addEventListener('drop', event => {
|
||||
event.preventDefault();
|
||||
form.classList.remove('border', 'border-primary');
|
||||
if (event.dataTransfer?.files?.length) {
|
||||
input.files = event.dataTransfer.files;
|
||||
status.textContent = `${input.files.length} file(s) selected.`;
|
||||
}
|
||||
});
|
||||
form.addEventListener('submit', event => {
|
||||
if (!input.files.length) return;
|
||||
event.preventDefault();
|
||||
const request = new XMLHttpRequest();
|
||||
button.disabled = true;
|
||||
progress.hidden = false;
|
||||
progress.value = 0;
|
||||
status.textContent = 'Uploading…';
|
||||
request.open('POST', form.action);
|
||||
request.upload.onprogress = update => {
|
||||
if (update.lengthComputable) progress.value = Math.round(update.loaded / update.total * 100);
|
||||
};
|
||||
request.onload = () => {
|
||||
button.disabled = false;
|
||||
if (request.status >= 200 && request.status < 400) {
|
||||
status.textContent = 'Upload complete.';
|
||||
window.location.reload();
|
||||
} else {
|
||||
status.textContent = request.responseText || 'Upload failed. Please try again.';
|
||||
}
|
||||
};
|
||||
request.onerror = () => { button.disabled = false; status.textContent = 'Connection lost. Please retry.'; };
|
||||
request.send(new FormData(form));
|
||||
});
|
||||
}
|
||||
})();
|
||||
@@ -0,0 +1,8 @@
|
||||
{% if files %}<ul class="list-unstyled mb-2">
|
||||
{% for file in files %}<li class="d-flex flex-wrap align-items-center gap-2 border rounded p-2 mb-2">
|
||||
<a href="{% url 'projects:attachment_download' file.id %}">{{ file.title }}</a>
|
||||
{% if file.byte_size <= 1048576 and file.mime_type == 'image/png' or file.byte_size <= 1048576 and file.mime_type == 'image/jpeg' or file.byte_size <= 1048576 and file.mime_type == 'image/webp' %}<a href="{% url 'projects:attachment_preview' file.id %}" target="_blank" rel="noopener" aria-label="Preview {{ file.title }}"><img src="{% url 'projects:attachment_preview' file.id %}" alt="" style="max-width:5rem;max-height:5rem;object-fit:contain"></a>{% elif file.mime_type == 'text/plain' and file.byte_size <= 1048576 %}<a href="{% url 'projects:attachment_preview' file.id %}" target="_blank" rel="noopener">Preview text</a>{% endif %}
|
||||
<small class="text-muted">{{ file.byte_size|filesizeformat }} · {{ file.created_at|date:'SHORT_DATETIME_FORMAT' }}{% if file.uploaded_by %} · {{ file.uploaded_by }}{% endif %}</small>
|
||||
{% if file.source_path %}<small class="text-muted">Snapshot: {{ file.source_path }}{% if file.source_commit %} @ {{ file.source_commit|slice:':12' }}{% endif %}</small>{% endif %}
|
||||
{% if can_edit %}<details><summary>Rename</summary><form method="post" action="{% url 'projects:attachment_update' file.id %}">{% csrf_token %}<label for="attachment-title-{{ file.id }}">Display title</label><input id="attachment-title-{{ file.id }}" name="title" maxlength="255" required value="{{ file.title }}"><button type="submit" class="btn btn-outline-secondary btn-sm">Save</button></form></details><form method="post" action="{% url 'projects:attachment_delete' file.id %}" onsubmit="return confirm('Delete this attachment?')">{% csrf_token %}<button type="submit" class="btn btn-outline-danger btn-sm" aria-label="Delete {{ file.title }}">Delete</button></form>{% endif %}
|
||||
</li>{% endfor %}</ul>{% else %}<p class="text-muted">No files attached.</p>{% endif %}
|
||||
@@ -15,6 +15,7 @@
|
||||
{% for card in column.visible_cards %}
|
||||
<article class="card mb-2" data-move="{% url 'projects:card_move' card.id %}">
|
||||
<div class="card-body">
|
||||
{% if can_edit and not show_archived %}<label class="d-block mb-1"><input type="checkbox" class="bulk-card-choice" value="{{ card.id }}" aria-label="Select {{ card.title }} for bulk edit"> Select</label>{% endif %}
|
||||
<a href="{% url 'projects:card' card.id %}"><strong>{{ card.title }}</strong></a>
|
||||
<div><span class="badge text-bg-secondary">{{ card.get_priority_display }}</span> <small>{{ card.get_card_type_display }}</small>{% if card.is_blocked %}<span class="badge text-bg-danger">Blocked</span>{% endif %}</div>
|
||||
{% if can_edit %}<form method="post" action="{% url 'projects:card_move' card.id %}" class="mt-2">
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
<div class="col-auto"><a class="btn btn-outline-secondary" href="{% url 'projects:board' project.id %}">Clear</a></div>
|
||||
</form>
|
||||
<span id="board-search-loading" class="htmx-indicator" role="status">Searching…</span>
|
||||
{% if can_edit and not show_archived %}<div class="d-flex align-items-center gap-2 mb-2" id="bulk-toolbar"><span id="bulk-count" role="status" aria-live="polite">0 cards selected</span><button type="button" class="btn btn-outline-primary btn-sm" id="bulk-edit-button" disabled>Bulk edit</button><button type="button" class="btn btn-outline-secondary btn-sm" id="bulk-clear-button">Clear selection</button></div>{% endif %}
|
||||
<div id="board-results">{% include 'projects/_board.html' %}</div>
|
||||
{% if can_edit %}<a class="btn btn-outline-secondary mt-3" href="{% url 'projects:column_create' project.id %}">Add column</a>
|
||||
<a class="btn btn-outline-secondary mt-3" href="{% url 'projects:tag_create' project.id %}">Add tag</a>{% endif %}
|
||||
@@ -39,6 +40,16 @@ function wireBoard() {
|
||||
}});
|
||||
}
|
||||
wireBoard(); document.body.addEventListener('htmx:afterSwap', wireBoard);
|
||||
const bulkCount = document.getElementById('bulk-count');
|
||||
function selectedBulkCards() { return [...document.querySelectorAll('.bulk-card-choice:checked')]; }
|
||||
function updateBulkCount() { if (!bulkCount) return; const n = selectedBulkCards().length; bulkCount.textContent = `${n} card${n === 1 ? '' : 's'} selected`; document.getElementById('bulk-edit-button').disabled = n === 0; }
|
||||
document.addEventListener('change', event => { if (event.target.matches('.bulk-card-choice')) updateBulkCount(); });
|
||||
document.getElementById('bulk-clear-button')?.addEventListener('click', () => { selectedBulkCards().forEach(box => box.checked = false); updateBulkCount(); });
|
||||
document.getElementById('bulk-edit-button')?.addEventListener('click', () => {
|
||||
const query = new URLSearchParams(); selectedBulkCards().forEach(box => query.append('card', box.value));
|
||||
location.href = '{% url 'projects:cards_bulk_edit' project.id %}?' + query.toString();
|
||||
});
|
||||
document.body.addEventListener('htmx:afterSwap', updateBulkCount);
|
||||
</script>
|
||||
{% csrf_token %}
|
||||
{% endif %}
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
{% extends 'core/base.html' %}
|
||||
{% block content %}
|
||||
<a href="{% url 'projects:board' project.id %}">← Back to {{ project.name }}</a>
|
||||
<h1 class="mt-2">Bulk edit {{ cards|length }} card{{ cards|length|pluralize }}</h1>
|
||||
<p>Choose the fields to change. Preview shows each card's exact changes before you apply them.</p>
|
||||
<details><summary>Selected cards</summary><ul>{% for card in cards %}<li>{{ card.title }} · revision {{ card.revision }}</li>{% endfor %}</ul></details>
|
||||
{% if error %}<div class="alert alert-danger" role="alert">{{ error }}</div>{% endif %}
|
||||
{% if applied %}<div class="alert alert-success" role="status">Updated {{ applied.changed_count }} card{{ applied.changed_count|pluralize }}. {{ applied.unchanged_count }} were already up to date. <a href="{% url 'projects:board' project.id %}">Return to board</a></div>{% else %}
|
||||
<form method="post">
|
||||
{% csrf_token %}
|
||||
{% for card in cards %}<input type="hidden" name="card" value="{{ card.id }}">{% endfor %}
|
||||
<input type="hidden" name="expected_revisions" value="{{ revisions_json }}">
|
||||
<input type="hidden" name="idempotency_key" value="{{ idempotency_key }}">
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-md-6"><label><input type="checkbox" name="change_column_id" value="1" {% if request.POST.change_column_id %}checked{% endif %}> Change column</label><select class="form-select" name="column_id" aria-label="New column">{% for column in columns %}<option value="{{ column.id }}" {% if request.POST.column_id == column.id|stringformat:'s' %}selected{% endif %}>{{ column.name }}</option>{% endfor %}</select></div>
|
||||
<div class="col-md-6"><label><input type="checkbox" name="change_priority" value="1" {% if request.POST.change_priority %}checked{% endif %}> Change priority</label><select class="form-select" name="priority" aria-label="New priority"><option value="low" {% if request.POST.priority == 'low' %}selected{% endif %}>Low</option><option value="medium" {% if request.POST.priority == 'medium' %}selected{% endif %}>Medium</option><option value="high" {% if request.POST.priority == 'high' %}selected{% endif %}>High</option></select></div>
|
||||
<div class="col-md-6"><label><input type="checkbox" name="change_assignee_id" value="1" {% if request.POST.change_assignee_id %}checked{% endif %}> Change assignee</label><select class="form-select" name="assignee_id" aria-label="New assignee"><option value="">Unassigned</option>{% for person in assignable %}<option value="{{ person.id }}" {% if request.POST.assignee_id == person.id|stringformat:'s' %}selected{% endif %}>{{ person.username }}</option>{% endfor %}</select></div>
|
||||
<div class="col-md-6"><label><input type="checkbox" name="change_tag_ids" value="1" {% if request.POST.change_tag_ids %}checked{% endif %}> Replace tags</label><select class="form-select" name="tag_ids" multiple size="4" aria-label="New tags">{% for tag in tags %}<option value="{{ tag.id }}" {% if tag.id|stringformat:'s' in selected_tag_ids %}selected{% endif %}>{{ tag.name }}</option>{% endfor %}</select><small>Hold Ctrl or Command to select several; leave empty to clear tags.</small></div>
|
||||
</div>
|
||||
<button class="btn btn-outline-primary" type="submit" name="action" value="preview">Preview changes</button>
|
||||
{% if preview and not applied %}<input type="hidden" name="preview_token" value="{{ preview_token }}"><button class="btn btn-primary" type="submit" name="action" value="apply">Apply changes to {{ preview.changed_count }} card{{ preview.changed_count|pluralize }}</button>{% endif %}
|
||||
</form>
|
||||
{% if preview %}<h2 class="h5 mt-4">Preview: {{ preview.changed_count }} changed, {{ preview.unchanged_count }} unchanged</h2>
|
||||
<ul>{% for item in preview.items %}<li><strong>{{ item.title }}</strong> (revision {{ item.revision }}){% if item.changed %}<ul>{% for field, delta in item.changes.items %}<li>{{ field }}: {{ delta.from }} → {{ delta.to }}</li>{% endfor %}</ul>{% else %} — unchanged{% endif %}</li>{% endfor %}</ul>{% endif %}
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
@@ -1,12 +1,18 @@
|
||||
{% extends 'core/base.html' %}{% load project_markdown %}
|
||||
{% extends 'core/base.html' %}{% load project_markdown static %}
|
||||
{% block content %}
|
||||
<a href="{% url 'projects:board' card.project_id %}">← {{ card.project.name }}</a>
|
||||
<div class="d-flex justify-content-between mt-3"><h1>{{ card.title }}</h1>{% if can_edit %}<div><a class="btn btn-outline-secondary" href="{% url 'projects:card_edit' card.id %}">Edit</a> {% if card.archived %}<form method="post" action="{% url 'projects:card_restore' card.id %}" class="d-inline">{% csrf_token %}<button class="btn btn-outline-success">Restore</button></form>{% else %}<form method="post" action="{% url 'projects:card_archive' card.id %}" class="d-inline">{% csrf_token %}<button class="btn btn-outline-danger">Archive</button></form>{% endif %}</div>{% endif %}</div>
|
||||
<p><span class="badge text-bg-secondary">{{ card.get_priority_display }}</span> {{ card.column.name }} · {{ card.get_card_type_display }} · Revision {{ card.revision }}</p>
|
||||
<div class="card card-body mb-4 markdown-body">{{ card.description_markdown|safe_markdown }}</div>
|
||||
<details><summary>Raw Markdown</summary><pre>{{ card.description_markdown }}</pre></details>
|
||||
<section aria-labelledby="card-files-heading" class="mt-4"><h2 id="card-files-heading" class="h4">Card files</h2>
|
||||
{% include 'projects/_attachment_list.html' with files=card_files %}
|
||||
{% if can_edit %}<form method="post" enctype="multipart/form-data" action="{% url 'projects:attachment_upload' card.id %}" class="mb-3" data-attachment-upload>{% csrf_token %}<label for="card-files-input" class="form-label">Add card files</label><input id="card-files-input" class="form-control" type="file" name="files" multiple required><button class="btn btn-outline-primary mt-2">Upload files</button><progress hidden max="100" value="0" aria-label="Upload progress"></progress><span role="status" aria-live="polite"></span></form>{% endif %}</section>
|
||||
<h2 class="h4 mt-4">Progress notes</h2>
|
||||
{% for comment in card.comments.all %}<div class="card card-body mb-2"><small>{{ comment.author }} · {{ comment.created_at }}</small><p>{{ comment.body|linebreaksbr }}</p></div>{% endfor %}
|
||||
{% for comment in comments %}<div class="card card-body mb-2"><small>{{ comment.author }} · {{ comment.created_at }}</small><p>{{ comment.body|linebreaksbr }}</p><h3 class="h6">Files on this progress note</h3>
|
||||
{% include 'projects/_attachment_list.html' with files=comment.attachments.all %}
|
||||
{% if can_edit %}<form method="post" enctype="multipart/form-data" action="{% url 'projects:attachment_upload' card.id %}" data-attachment-upload>{% csrf_token %}<input type="hidden" name="comment_id" value="{{ comment.id }}"><label for="note-files-{{ comment.id }}" class="form-label">Add files to this note</label><input id="note-files-{{ comment.id }}" class="form-control" type="file" name="files" multiple required><button class="btn btn-outline-primary mt-2">Upload files</button><progress hidden max="100" value="0" aria-label="Upload progress"></progress><span role="status" aria-live="polite"></span></form>{% endif %}</div>{% endfor %}
|
||||
{% if can_edit %}<form method="post" action="{% url 'projects:card_comment' card.id %}">{% csrf_token %}<label for="comment">Add note</label><textarea class="form-control" id="comment" name="body" required></textarea><button class="btn btn-success mt-2">Add note</button></form>{% endif %}
|
||||
<h2 class="h4 mt-4">History</h2><ul>{% for event in card.activity.all %}<li>{{ event.created_at }} · {{ event.action }} by {{ event.actor }}</li>{% endfor %}</ul>
|
||||
<script defer src="{% static 'projects/attachments.js' %}"></script>
|
||||
{% endblock %}
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
import base64
|
||||
import hashlib
|
||||
import tempfile
|
||||
from pathlib import Path
|
||||
from unittest.mock import patch
|
||||
|
||||
from asgiref.sync import async_to_sync
|
||||
from mcp.server.mcpserver.exceptions import ToolError
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.files.uploadedfile import SimpleUploadedFile
|
||||
from django.test import TestCase, override_settings
|
||||
from django.urls import reverse
|
||||
|
||||
from . import attachments
|
||||
from .models import CardAttachment, CardComment, Membership
|
||||
from .services import create_card, create_project
|
||||
|
||||
|
||||
class AttachmentTests(TestCase):
|
||||
def setUp(self):
|
||||
self.temp = tempfile.TemporaryDirectory()
|
||||
self.addCleanup(self.temp.cleanup)
|
||||
self.settings = override_settings(MEDIA_ROOT=self.temp.name)
|
||||
self.settings.enable()
|
||||
self.addCleanup(self.settings.disable)
|
||||
users = get_user_model()
|
||||
self.owner = users.objects.create_user('attachment-owner')
|
||||
self.viewer = users.objects.create_user('attachment-viewer')
|
||||
self.stranger = users.objects.create_user('attachment-stranger')
|
||||
self.project = create_project(self.owner, name='Attachment board')
|
||||
self.card = create_card(self.owner, self.project, title='Files')
|
||||
self.note = CardComment.objects.create(card=self.card, author=self.owner, body='Review these')
|
||||
|
||||
def test_card_and_note_upload_download_and_permissions(self):
|
||||
self.client.force_login(self.owner)
|
||||
url = reverse('projects:attachment_upload', args=[self.card.pk])
|
||||
response = self.client.post(url, {'files': [SimpleUploadedFile(f'{n}.txt', f'content {n}'.encode()) for n in range(3)]})
|
||||
self.assertEqual(response.status_code, 302)
|
||||
response = self.client.post(url, {'comment_id': self.note.pk, 'files': [SimpleUploadedFile(f'note{n}.md', b'# note') for n in range(2)]})
|
||||
self.assertEqual(response.status_code, 302)
|
||||
self.assertEqual(self.card.attachments.filter(comment__isnull=True).count(), 3)
|
||||
self.assertEqual(self.note.attachments.count(), 2)
|
||||
item = self.note.attachments.first()
|
||||
page = self.client.get(reverse('projects:card', args=[self.card.pk]))
|
||||
self.assertContains(page, 'Card files')
|
||||
self.assertContains(page, 'Files on this progress note')
|
||||
self.assertContains(page, item.title)
|
||||
self.assertEqual(item.sha256, hashlib.sha256(b'# note').hexdigest())
|
||||
download = reverse('projects:attachment_download', args=[item.pk])
|
||||
self.assertEqual(b''.join(self.client.get(download).streaming_content), b'# note')
|
||||
self.assertIn('attachment', self.client.get(download)['Content-Disposition'])
|
||||
preview = self.client.get(reverse('projects:attachment_preview', args=[item.pk]))
|
||||
self.assertEqual(preview.content, b'# note')
|
||||
self.assertIn('sandbox', preview['Content-Security-Policy'])
|
||||
self.client.force_login(self.stranger)
|
||||
self.assertEqual(self.client.get(download).status_code, 404)
|
||||
self.assertEqual(self.client.post(reverse('projects:attachment_delete', args=[item.pk])).status_code, 404)
|
||||
Membership.objects.create(project=self.project, user=self.viewer, role='viewer')
|
||||
self.client.force_login(self.viewer)
|
||||
self.assertEqual(self.client.get(download).status_code, 200)
|
||||
self.assertEqual(self.client.post(reverse('projects:attachment_delete', args=[item.pk])).status_code, 403)
|
||||
|
||||
def test_validation_and_cleanup(self):
|
||||
for name, data in [('evil.svg', b'<svg/>'), ('bad.png', b'not-png'), ('bad.txt', b'\x00')]:
|
||||
with self.assertRaises(ValidationError):
|
||||
attachments.upload_attachment(self.owner, self.card, filename=name, data=data)
|
||||
with self.assertRaises(ValidationError):
|
||||
attachments.upload_attachment(self.owner, self.card, filename='safe.txt', data=b'hello', comment_id=999)
|
||||
item = attachments.upload_attachment(self.owner, self.card, filename='safe.txt', data=b'hello', comment_id=self.note.pk)
|
||||
path = Path(item.file.path)
|
||||
self.assertTrue(path.exists())
|
||||
self.note.delete()
|
||||
self.assertFalse(CardAttachment.objects.filter(pk=item.pk).exists())
|
||||
self.assertFalse(path.exists())
|
||||
|
||||
def test_batch_upload_rolls_back_on_invalid_file(self):
|
||||
self.client.force_login(self.owner)
|
||||
response = self.client.post(reverse('projects:attachment_upload', args=[self.card.pk]), {
|
||||
'files': [SimpleUploadedFile('good.txt', b'valid'), SimpleUploadedFile('bad.svg', b'<svg/>')]
|
||||
})
|
||||
self.assertEqual(response.status_code, 400)
|
||||
self.assertFalse(self.card.attachments.exists())
|
||||
self.assertFalse(list(Path(self.temp.name).rglob('*.*')))
|
||||
|
||||
def test_source_snapshot_metadata_and_size_limits(self):
|
||||
data = b'function jump() { return true; }\n'
|
||||
item = attachments.upload_attachment(self.owner, self.card, filename='companion.js', data=data,
|
||||
comment_id=self.note.pk, source='mcp', source_path='dashboard/static/dashboard/companion.js', source_commit='a' * 40)
|
||||
self.assertEqual(item.sha256, hashlib.sha256(data).hexdigest())
|
||||
self.assertEqual(base64.b64encode(item.file.read()).decode(), base64.b64encode(data).decode())
|
||||
with override_settings(PROJECTS_ATTACHMENT_MAX_BYTES=3):
|
||||
with self.assertRaises(ValidationError):
|
||||
attachments.upload_attachment(self.owner, self.card, filename='large.txt', data=b'four')
|
||||
|
||||
def test_mcp_upload_fetch_and_card_isolation(self):
|
||||
from mcp_server.server import create_server
|
||||
server = create_server()
|
||||
payload = b'function jump() { return true; }\n'
|
||||
with patch('mcp_server.server._actor', return_value=self.owner):
|
||||
uploaded = async_to_sync(server.call_tool)('attachments_upload', {
|
||||
'card_id': str(self.card.pk), 'filename': 'companion.js',
|
||||
'content_base64': base64.b64encode(payload).decode(), 'comment_id': self.note.pk,
|
||||
'source_path': 'dashboard/static/dashboard/companion.js', 'source_commit': 'b' * 40,
|
||||
}).structured_content
|
||||
self.assertEqual(uploaded['sha256'], hashlib.sha256(payload).hexdigest())
|
||||
fetched = async_to_sync(server.call_tool)('attachments_fetch', {'attachment_id': uploaded['id']}).structured_content
|
||||
self.assertEqual(base64.b64decode(fetched['content_base64']), payload)
|
||||
self.assertEqual(fetched['text'], payload.decode())
|
||||
with patch('mcp_server.server._actor', return_value=self.stranger):
|
||||
with self.assertRaises(ToolError):
|
||||
async_to_sync(server.call_tool)('attachments_fetch', {'attachment_id': uploaded['id']})
|
||||
+73
-2
@@ -4,10 +4,11 @@ from django.core.exceptions import ValidationError
|
||||
from django.urls import reverse
|
||||
from django.http import HttpResponse
|
||||
from django.utils import timezone
|
||||
from .models import Card, CardRevision, Membership, Profile
|
||||
from unittest.mock import patch
|
||||
from .models import Activity, Card, CardRevision, Membership, Profile
|
||||
from .forms import ProfileForm
|
||||
from .middleware import ProfileTimezoneMiddleware
|
||||
from .services import RevisionConflict, card_for, create_card, create_project, move_card, update_card, update_column
|
||||
from .services import RevisionConflict, bulk_update_cards, card_for, create_card, create_project, move_card, update_card, update_column
|
||||
|
||||
|
||||
class ProjectWorkflowTests(TestCase):
|
||||
@@ -134,3 +135,73 @@ class ProjectWorkflowTests(TestCase):
|
||||
self.assertNotContains(response, 'New card')
|
||||
response = self.client.post(reverse('projects:card_move', args=[card.pk]), {'column_id': str(card.column_id)})
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_bulk_preview_apply_and_idempotent_retry_for_twenty_cards(self):
|
||||
cards = [create_card(self.owner, self.project, title=f'Card {number}') for number in range(21)]
|
||||
ids = [str(card.pk) for card in cards]
|
||||
revisions = {identifier: 1 for identifier in ids}
|
||||
done = self.project.board.columns.get(is_done=True)
|
||||
changes = {'column_id': str(done.pk), 'priority': 'high'}
|
||||
preview = bulk_update_cards(self.owner, self.project, ids, revisions, changes, dry_run=True)
|
||||
self.assertEqual(preview['changed_count'], 21)
|
||||
self.assertEqual(CardRevision.objects.filter(card__in=cards).count(), 21)
|
||||
result = bulk_update_cards(self.owner, self.project, ids, revisions, changes, idempotency_key='bulk-21')
|
||||
self.assertEqual(result['changed_count'], 21)
|
||||
self.assertEqual(Card.objects.filter(pk__in=ids, column=done, priority='high', revision=2).count(), 21)
|
||||
self.assertEqual(CardRevision.objects.filter(card__in=cards).count(), 42)
|
||||
self.assertEqual(Activity.objects.filter(card__in=cards, action='card.bulk_updated').count(), 21)
|
||||
self.assertEqual(bulk_update_cards(self.owner, self.project, ids, revisions, changes, idempotency_key='bulk-21'), result)
|
||||
self.assertEqual(Activity.objects.filter(card__in=cards, action='card.bulk_updated').count(), 21)
|
||||
|
||||
def test_bulk_rejects_duplicates_conflicts_cross_project_and_invalid_field(self):
|
||||
first = create_card(self.owner, self.project, title='First')
|
||||
second = create_card(self.owner, self.project, title='Second')
|
||||
another = create_project(self.owner, name='Other board')
|
||||
foreign = create_card(self.owner, another, title='Foreign')
|
||||
ids = [str(first.pk), str(second.pk)]
|
||||
revisions = {identifier: 1 for identifier in ids}
|
||||
with self.assertRaises(ValidationError):
|
||||
bulk_update_cards(self.owner, self.project, ids + ids[:1], revisions, {'priority': 'high'})
|
||||
with self.assertRaises(ValidationError):
|
||||
bulk_update_cards(self.owner, self.project, ids, {ids[0]: 0, ids[1]: 1}, {'priority': 'high'})
|
||||
with self.assertRaises(ValidationError):
|
||||
bulk_update_cards(self.owner, self.project, ids + [str(foreign.pk)], revisions, {'priority': 'high'})
|
||||
with self.assertRaises(ValidationError):
|
||||
bulk_update_cards(self.owner, self.project, ids, revisions, {'priority': 'high', 'tag_ids': [9999]})
|
||||
self.assertEqual(Card.objects.filter(pk__in=ids, priority='medium').count(), 2)
|
||||
|
||||
def test_bulk_web_preview_and_apply(self):
|
||||
card = create_card(self.owner, self.project, title='For bulk edit')
|
||||
self.client.force_login(self.owner)
|
||||
url = reverse('projects:cards_bulk_edit', args=[self.project.pk])
|
||||
self.assertContains(self.client.get(url, {'card': str(card.pk)}), 'For bulk edit')
|
||||
data = {'card': [str(card.pk)], 'expected_revisions': __import__('json').dumps({str(card.pk): 1}),
|
||||
'change_priority': '1', 'priority': 'high', 'action': 'preview'}
|
||||
response = self.client.post(url, data)
|
||||
self.assertContains(response, 'Apply changes to 1 card')
|
||||
card.refresh_from_db(); self.assertEqual(card.priority, 'medium')
|
||||
data.update({'action': 'apply', 'preview_token': response.context['preview_token'], 'idempotency_key': 'web-bulk-1'})
|
||||
self.assertContains(self.client.post(url, data), 'Updated 1 card')
|
||||
card.refresh_from_db(); self.assertEqual(card.priority, 'high')
|
||||
|
||||
def test_bulk_rolls_back_if_a_write_fails(self):
|
||||
cards = [create_card(self.owner, self.project, title=title) for title in ('A', 'B')]
|
||||
ids = [str(card.pk) for card in cards]
|
||||
revisions = {identifier: 1 for identifier in ids}
|
||||
original = Activity.objects.create
|
||||
calls = 0
|
||||
|
||||
def fail_on_second_bulk_activity(*args, **kwargs):
|
||||
nonlocal calls
|
||||
if kwargs.get('action') == 'card.bulk_updated':
|
||||
calls += 1
|
||||
if calls == 2:
|
||||
raise RuntimeError('Simulated activity storage failure')
|
||||
return original(*args, **kwargs)
|
||||
|
||||
with patch.object(Activity.objects, 'create', side_effect=fail_on_second_bulk_activity):
|
||||
with self.assertRaises(RuntimeError):
|
||||
bulk_update_cards(self.owner, self.project, ids, revisions, {'priority': 'high'}, idempotency_key='rollback-check')
|
||||
self.assertEqual(Card.objects.filter(pk__in=ids, priority='medium', revision=1).count(), 2)
|
||||
self.assertEqual(CardRevision.objects.filter(card__in=cards).count(), 2)
|
||||
self.assertEqual(Activity.objects.filter(card__in=cards, action='card.bulk_updated').count(), 0)
|
||||
|
||||
@@ -13,6 +13,7 @@ urlpatterns = [
|
||||
path('<uuid:project_id>/archive/', views.project_archive, name='archive'),
|
||||
path('<uuid:project_id>/restore/', views.project_restore, name='restore'),
|
||||
path('<uuid:project_id>/cards/new/', views.card_create, name='card_create'),
|
||||
path('<uuid:project_id>/cards/bulk-edit/', views.cards_bulk_edit, name='cards_bulk_edit'),
|
||||
path('<uuid:project_id>/columns/new/', views.column_create, name='column_create'),
|
||||
path('<uuid:project_id>/tags/new/', views.tag_create, name='tag_create'),
|
||||
path('<uuid:project_id>/columns/reorder/', views.column_reorder, name='column_reorder'),
|
||||
@@ -24,6 +25,11 @@ urlpatterns = [
|
||||
path('cards/<uuid:card_id>/edit/', views.card_edit, name='card_edit'),
|
||||
path('cards/<uuid:card_id>/move/', views.card_move, name='card_move'),
|
||||
path('cards/<uuid:card_id>/comment/', views.card_comment, name='card_comment'),
|
||||
path('cards/<uuid:card_id>/attachments/', views.attachment_upload, name='attachment_upload'),
|
||||
path('attachments/<uuid:attachment_id>/download/', views.attachment_download, name='attachment_download'),
|
||||
path('attachments/<uuid:attachment_id>/preview/', views.attachment_preview, name='attachment_preview'),
|
||||
path('attachments/<uuid:attachment_id>/delete/', views.attachment_delete, name='attachment_delete'),
|
||||
path('attachments/<uuid:attachment_id>/update/', views.attachment_update, name='attachment_update'),
|
||||
path('cards/<uuid:card_id>/archive/', views.card_archive, name='card_archive'),
|
||||
path('cards/<uuid:card_id>/restore/', views.card_restore, name='card_restore'),
|
||||
]
|
||||
|
||||
+135
-3
@@ -2,11 +2,15 @@ from django.contrib.auth.decorators import login_required
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.contrib.auth.views import LoginView
|
||||
from django.core.cache import cache
|
||||
from django.http import HttpResponse
|
||||
from django.core import signing
|
||||
from django.http import HttpResponse, FileResponse
|
||||
import hashlib
|
||||
import json
|
||||
import uuid
|
||||
from urllib.parse import urlsplit
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.db.models import Q, Count
|
||||
from django.db import transaction
|
||||
from django.core.paginator import Paginator
|
||||
from django.http import HttpResponseBadRequest, JsonResponse
|
||||
from django.shortcuts import get_object_or_404, redirect, render
|
||||
@@ -15,8 +19,9 @@ from django.utils import timezone
|
||||
from django.conf import settings
|
||||
from oauth2_provider.models import get_access_token_model, revoke_access_token
|
||||
from .forms import CardForm, ColumnForm, ProfileForm, ProjectForm, TagForm
|
||||
from .models import Activity, Card, CardComment, Column, Profile, Membership, Tag
|
||||
from .models import Activity, Card, CardComment, CardAttachment, Column, Profile, Membership, Tag
|
||||
from . import services
|
||||
from . import attachments
|
||||
from .templatetags.project_markdown import safe_markdown
|
||||
|
||||
|
||||
@@ -128,6 +133,54 @@ def board(request, project_id):
|
||||
return render(request, template, context)
|
||||
|
||||
|
||||
@login_required
|
||||
def cards_bulk_edit(request, project_id):
|
||||
project = services.project_for(request.user, project_id, write=True)
|
||||
ids = request.GET.getlist('card') if request.method == 'GET' else request.POST.getlist('card')
|
||||
if not 1 <= len(ids) <= 100 or len(set(ids)) != len(ids):
|
||||
return HttpResponseBadRequest('Select between 1 and 100 unique cards.')
|
||||
try:
|
||||
cards = list(Card.objects.filter(project=project, archived=False, pk__in=ids).select_related('column'))
|
||||
except (ValueError, ValidationError):
|
||||
return HttpResponseBadRequest('Invalid card selection.')
|
||||
if len(cards) != len(ids):
|
||||
return HttpResponseBadRequest('One or more selected cards are unavailable.')
|
||||
by_id = {str(card.pk): card for card in cards}
|
||||
cards = [by_id[identifier] for identifier in ids]
|
||||
context = {'project': project, 'cards': cards, 'columns': project.board.columns.filter(archived=False),
|
||||
'assignable': get_user_model().objects.filter(pk__in=[project.owner_id, *project.memberships.values_list('user_id', flat=True)]).order_by('username'),
|
||||
'tags': Tag.objects.filter(project=project).order_by('name'), 'selected_tag_ids': request.POST.getlist('tag_ids'),
|
||||
'revisions_json': request.POST.get('expected_revisions', ''), 'idempotency_key': request.POST.get('idempotency_key', ''),
|
||||
'title': 'Bulk edit cards', 'section': 'projects'}
|
||||
if request.method == 'POST':
|
||||
try:
|
||||
revisions = json.loads(request.POST['expected_revisions'])
|
||||
changes = {}
|
||||
for field in ('column_id', 'priority', 'assignee_id', 'tag_ids'):
|
||||
if request.POST.get('change_' + field):
|
||||
if field == 'tag_ids': changes[field] = [int(value) for value in request.POST.getlist('tag_ids')]
|
||||
elif field == 'assignee_id': changes[field] = int(request.POST[field]) if request.POST.get(field) else None
|
||||
else: changes[field] = request.POST[field]
|
||||
context.update({'revisions_json': json.dumps(revisions), 'changes_json': json.dumps(changes), 'idempotency_key': request.POST.get('idempotency_key') or str(uuid.uuid4())})
|
||||
confirmation = {'user': request.user.pk, 'project': str(project.pk), 'ids': ids, 'revisions': revisions, 'changes': changes}
|
||||
if request.POST.get('action') == 'apply':
|
||||
try:
|
||||
submitted = signing.loads(request.POST['preview_token'], salt='card-bulk-preview', max_age=1800)
|
||||
except (signing.BadSignature, signing.SignatureExpired):
|
||||
raise ValidationError('Preview expired or changed. Preview again.')
|
||||
if submitted != confirmation:
|
||||
raise ValidationError('Selection or changes differ from the preview. Preview again.')
|
||||
context['applied'] = services.bulk_update_cards(request.user, project, ids, revisions, changes, idempotency_key=request.POST['idempotency_key'])
|
||||
else:
|
||||
context['preview'] = services.bulk_update_cards(request.user, project, ids, revisions, changes, dry_run=True)
|
||||
context['preview_token'] = signing.dumps(confirmation, salt='card-bulk-preview')
|
||||
except (KeyError, ValueError, TypeError, ValidationError) as exc:
|
||||
context['error'] = str(exc)
|
||||
else:
|
||||
context['revisions_json'] = json.dumps({str(card.pk): card.revision for card in cards})
|
||||
return render(request, 'projects/bulk_edit.html', context)
|
||||
|
||||
|
||||
@login_required
|
||||
def card_create(request, project_id):
|
||||
project = services.project_for(request.user, project_id, write=True)
|
||||
@@ -146,7 +199,86 @@ def card_create(request, project_id):
|
||||
def card_detail(request, card_id):
|
||||
card = services.card_for(request.user, card_id)
|
||||
can_edit = card.project.owner_id == request.user.pk or Membership.objects.filter(project=card.project, user=request.user, role='editor').exists()
|
||||
return render(request, 'projects/card.html', {'card': card, 'can_edit': can_edit, 'title': card.title, 'section': 'projects'})
|
||||
return render(request, 'projects/card.html', {'card': card, 'can_edit': can_edit, 'title': card.title, 'section': 'projects',
|
||||
'card_files': card.attachments.filter(comment__isnull=True).select_related('uploaded_by'),
|
||||
'comments': card.comments.prefetch_related('attachments').select_related('author').order_by('created_at')})
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def attachment_upload(request, card_id):
|
||||
card = services.card_for(request.user, card_id, write=True)
|
||||
files = request.FILES.getlist('files')
|
||||
if not files:
|
||||
return HttpResponseBadRequest('Select one or more files.')
|
||||
if len(files) > 10:
|
||||
return HttpResponseBadRequest('Upload at most 10 files at once.')
|
||||
comment_id = request.POST.get('comment_id') or None
|
||||
created = []
|
||||
try:
|
||||
with transaction.atomic():
|
||||
for file in files:
|
||||
if file.size > settings.PROJECTS_ATTACHMENT_MAX_BYTES:
|
||||
raise ValidationError('File exceeds the per-file size limit.')
|
||||
created.append(attachments.upload_attachment(request.user, card, filename=file.name, data=file.read(),
|
||||
comment_id=comment_id, title=request.POST.get('title', ''), description=request.POST.get('description', '')))
|
||||
except Exception as exc:
|
||||
for item in created:
|
||||
item.file.delete(save=False)
|
||||
if isinstance(exc, ValidationError):
|
||||
return HttpResponseBadRequest('; '.join(exc.messages))
|
||||
raise
|
||||
return redirect('projects:card', card_id=card.pk)
|
||||
|
||||
|
||||
@login_required
|
||||
def attachment_download(request, attachment_id):
|
||||
item = get_object_or_404(CardAttachment.objects.select_related('card'), pk=attachment_id)
|
||||
services.card_for(request.user, item.card_id)
|
||||
response = FileResponse(item.file.open('rb'), as_attachment=True, filename=item.original_filename,
|
||||
content_type='application/octet-stream')
|
||||
response['X-Content-Type-Options'] = 'nosniff'
|
||||
response['Cache-Control'] = 'private, no-store'
|
||||
return response
|
||||
|
||||
|
||||
@login_required
|
||||
def attachment_preview(request, attachment_id):
|
||||
item = get_object_or_404(CardAttachment.objects.select_related('card'), pk=attachment_id)
|
||||
services.card_for(request.user, item.card_id)
|
||||
if item.mime_type not in {'image/png', 'image/jpeg', 'image/webp', 'text/plain'} or item.byte_size > 1024 * 1024:
|
||||
return HttpResponseBadRequest('Preview unavailable for this file.')
|
||||
if item.mime_type == 'text/plain':
|
||||
with item.file.open('rb') as stream:
|
||||
response = HttpResponse(stream.read(1024 * 1024).decode('utf-8'), content_type='text/plain; charset=utf-8')
|
||||
else:
|
||||
response = FileResponse(item.file.open('rb'), content_type=item.mime_type)
|
||||
response['X-Content-Type-Options'] = 'nosniff'
|
||||
response['Content-Security-Policy'] = "default-src 'none'; sandbox"
|
||||
response['Cache-Control'] = 'private, no-store'
|
||||
return response
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def attachment_delete(request, attachment_id):
|
||||
item = get_object_or_404(CardAttachment.objects.select_related('card__project'), pk=attachment_id)
|
||||
services.card_for(request.user, item.card_id, write=True)
|
||||
attachments.delete_attachment(request.user, item)
|
||||
return redirect('projects:card', card_id=item.card_id)
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def attachment_update(request, attachment_id):
|
||||
item = get_object_or_404(CardAttachment.objects.select_related('card'), pk=attachment_id)
|
||||
services.card_for(request.user, item.card_id, write=True)
|
||||
title = request.POST.get('title', '').strip()
|
||||
if not title or len(title) > 255:
|
||||
return HttpResponseBadRequest('Title must be between 1 and 255 characters.')
|
||||
item.title = title
|
||||
item.save(update_fields=['title'])
|
||||
return redirect('projects:card', card_id=item.card_id)
|
||||
|
||||
|
||||
@login_required
|
||||
|
||||
Reference in New Issue
Block a user