Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Migrate InternGroup to Group #104

Merged
merged 4 commits into from
Dec 20, 2016
Merged

Migrate InternGroup to Group #104

merged 4 commits into from
Dec 20, 2016

Conversation

matsasc
Copy link
Contributor

@matsasc matsasc commented Dec 18, 2016

Like I mentioned in #78. I think the InternGroup should have been in core and not in Intern since it's the same thing for vouchers.

I haven't done any changes in vouchers in here. Would like some feedback on it before doing it.

@@ -0,0 +1 @@
[{"model": "core.group", "pk": 1, "fields": {"name": "Hovedstyret", "leader": 1, "description": "HS sitt ansvar er \u00e5 drive foreningen"}}, {"model": "core.group", "pk": 2, "fields": {"name": "Kjellerstyret", "leader": 2, "description": "Kjellerstyret styrer Escape"}}, {"model": "core.group", "pk": 3, "fields": {"name": "\u00d8konomi", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 4, "fields": {"name": "Arrangementsgruppen", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 5, "fields": {"name": "Promotering", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 6, "fields": {"name": "Bar", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 7, "fields": {"name": "Kaf\u00e9", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 8, "fields": {"name": "DJ", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 9, "fields": {"name": "Arkivgruppen", "leader": 1, "description": ""}}, {"model": "core.group", "pk": 10, "fields": {"name": "Webgruppa", "leader": 1, "description": ""}}]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kunne du pretty-formatert dette? Også mangler det en newline :p

Copy link
Member

@henrist henrist left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Har ikke så mye å tilføye her egentlig. Har ikke vært borti å flytte modell fra en app til en annen, men tipper du har skjønt greia, så slipper jeg :p

Kunne du testet at alt funker fra scratch uten en database, om du ikke allerede har gjort det?

description = models.CharField(max_length=300, null=True, blank=True)

def __str__(self):
return self.name
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

newline?

Pretty printed group fixtures.

Fixed some small code style stuff in core.models
@matsasc
Copy link
Contributor Author

matsasc commented Dec 19, 2016

Har testet med både ny database og å lage en database fra master branchen og å kjøre migrasjonene på dem. Begge deler funker fint.

@henrist
Copy link
Member

henrist commented Dec 19, 2016

Har testet med både ny database og å lage en database fra master branchen og å kjøre migrasjonene på dem. Begge deler funker fint.

Ah, nice! :)

"description": ""
}
}
]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Newline? :p

@matsasc matsasc merged commit 79aeff5 into master Dec 20, 2016
@matsasc matsasc deleted the InternGroupsToGroups branch January 7, 2017 19:21
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants