Skip to content
Snippets Groups Projects
Commit 0a734cfd authored by LouisGendron's avatar LouisGendron
Browse files

Merge branch '166-various-model-update' into 'master'

Resolve "Various model update"

Closes #166

See merge request !90
parents 8540f274 0b7995ae
No related branches found
No related tags found
1 merge request!90Resolve "Various model update"
# Generated by Django 2.2.17 on 2023-02-01 19:52
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('portal', '0028_auto_20230105_1026'),
]
operations = [
migrations.AddField(
model_name='sharegroup',
name='managed_by_staff',
field=models.BooleanField(default=False, verbose_name='Managed by staff'),
),
migrations.AlterField(
model_name='datafile',
name='lab',
field=models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='files', to='portal.Lab', verbose_name='Belongs to this lab'),
),
migrations.AlterField(
model_name='dataset',
name='read_only',
field=models.BooleanField(default=True, help_text='Prevent edits from users with which you share this DataSet', verbose_name='Read only'),
),
migrations.AlterField(
model_name='sharegroup',
name='name',
field=models.CharField(max_length=64, unique=True, verbose_name='Name'),
),
]
......@@ -181,7 +181,7 @@ class DataFile(models.Model):
iric_data_id = models.CharField(max_length=10, verbose_name=_('ID'), null=True)
uploaded_by = models.ForeignKey(Profile, on_delete=models.PROTECT, verbose_name=_('Uploaded by'), related_name='uploaded_files')
lab = models.ForeignKey(Lab, null=True, blank=True, on_delete=models.PROTECT, related_name='files', verbose_name=_('Belongs to this lab'), default=None)
lab = models.ForeignKey(Lab, null=True, blank=False, on_delete=models.PROTECT, related_name='files', verbose_name=_('Belongs to this lab'), default=None)
objects = DataFileManager()
......@@ -260,10 +260,11 @@ class ShareGroup(models.Model):
class Meta:
ordering = ['name']
name = models.CharField(max_length=64, verbose_name=_('Name'))
name = models.CharField(max_length=64, unique=True, verbose_name=_('Name'))
creation_timestamp = models.DateTimeField(verbose_name=_('Creation Timestamp'), auto_now_add=True)
update_timestamp = models.DateTimeField(verbose_name=_('Last Update Timestamp'), auto_now=True)
last_update_by = models.ForeignKey(Profile, on_delete=models.PROTECT, verbose_name=_('Last Update By'), related_name='my_sharegroups')
managed_by_staff = models.BooleanField(default=False, verbose_name=_('Managed by staff'))
profiles = models.ManyToManyField(Profile, related_name='sharegroups')
......@@ -330,7 +331,7 @@ class DataSet(models.Model):
share_labs = models.ManyToManyField(Lab, blank=True, related_name='shared_datasets', verbose_name=_('Share with these labs'))
share_groups = models.ManyToManyField(ShareGroup, blank=True, related_name='shared_datasets', verbose_name=_('Share with these groups'))
files = models.ManyToManyField(DataFile, related_name='datasets', verbose_name=_('Files'), blank=True)
read_only = models.BooleanField(default=False, verbose_name=_('Read only'), help_text=_('Prevent edits from users with which you share this DataSet'))
read_only = models.BooleanField(default=True, verbose_name=_('Read only'), help_text=_('Prevent edits from users with which you share this DataSet'))
iric_data_id = models.CharField(max_length=10, verbose_name=_('ID'), null=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment