Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update #63

Merged
merged 2 commits into from
Feb 15, 2017
Merged

Update #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f023a0b
Remove note
rossant Feb 15, 2017
319af7f
Remote dataset.experiment
rossant Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion alyx/actions/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ class NoteAdmin(BaseActionAdmin):
admin.site.register(OtherAction, BaseActionAdmin)
admin.site.register(VirusInjection, BaseActionAdmin)

admin.site.register(Note, NoteAdmin)
admin.site.register(Surgery, SurgeryAdmin)
7 changes: 0 additions & 7 deletions alyx/actions/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,6 @@ class Meta:
verbose_name_plural = "surgeries"


class Note(BaseAction):
"""
A note about a subject.
"""
pass


class Experiment(BaseAction):
"""
An experiment or training session performed on a subject.
Expand Down
2 changes: 0 additions & 2 deletions alyx/data/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@ def __str__(self):
class Dataset(BaseModel):
"""Collection of LogicalFiles (files or folders) grouped together."""
name = models.CharField(max_length=255, null=True, blank=True)
experiment = models.ForeignKey(Experiment, related_name="datasets_related",
help_text="The Experiment to which this data belongs")

def __str__(self):
return str(getattr(self, 'name', 'unnamed')) + " belonging to " + str(self.experiment)
Expand Down