Commit 7dd86401bf31ea714ea1a7a123c4d5e26914cb9b
1 parent
c8e26bfb
Exists in
fix_superarchives_imports
Fix imports from super_archives
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com> Signed-off-by: Macartur Sousa<macartur.sc@gmail.com>
Showing
3 changed files
with
5 additions
and
5 deletions
Show diff stats
src/colab-spb-plugin/src/colab_spb/migrations/0001_initial.py
@@ -9,7 +9,7 @@ class Migration(migrations.Migration): | @@ -9,7 +9,7 @@ class Migration(migrations.Migration): | ||
9 | dependencies = [ | 9 | dependencies = [ |
10 | ('colab_gitlab', '0001_initial'), | 10 | ('colab_gitlab', '0001_initial'), |
11 | ('colab_noosfero', '__first__'), | 11 | ('colab_noosfero', '__first__'), |
12 | - ('super_archives', '0002_mailinglist_is_private'), | 12 | + ('colab_superarchives', '0002_thread_user'), |
13 | ] | 13 | ] |
14 | 14 | ||
15 | operations = [ | 15 | operations = [ |
@@ -19,7 +19,7 @@ class Migration(migrations.Migration): | @@ -19,7 +19,7 @@ class Migration(migrations.Migration): | ||
19 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), | 19 | ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), |
20 | ('community', models.ForeignKey(to='colab_noosfero.NoosferoCommunity', null=True)), | 20 | ('community', models.ForeignKey(to='colab_noosfero.NoosferoCommunity', null=True)), |
21 | ('group', models.ForeignKey(to='colab_gitlab.GitlabGroup', null=True)), | 21 | ('group', models.ForeignKey(to='colab_gitlab.GitlabGroup', null=True)), |
22 | - ('mail_list', models.ForeignKey(to='super_archives.MailingList', null=True)), | 22 | + ('mail_list', models.ForeignKey(to='colab_superarchives.MailingList', null=True)), |
23 | ], | 23 | ], |
24 | options={ | 24 | options={ |
25 | }, | 25 | }, |
src/colab-spb-plugin/src/colab_spb/models.py
1 | from colab_gitlab import models as gitlab | 1 | from colab_gitlab import models as gitlab |
2 | from colab_noosfero import models as noosfero | 2 | from colab_noosfero import models as noosfero |
3 | -from colab.super_archives import models as mailman | 3 | +from colab_superarchives import models as mailman |
4 | from django.db import models | 4 | from django.db import models |
5 | 5 | ||
6 | 6 |
src/colab-spb-plugin/src/colab_spb/views.py
1 | # -*- coding: utf-8 -*- | 1 | # -*- coding: utf-8 -*- |
2 | from django.shortcuts import render | 2 | from django.shortcuts import render |
3 | from django.http import HttpResponse | 3 | from django.http import HttpResponse |
4 | -from colab.super_archives.models import MailingList, Thread | ||
5 | -from colab.accounts.utils import mailman | 4 | +from colab_superarchives.models import MailingList, Thread |
5 | +from colab_superarchives.utils import mailman | ||
6 | from colab.accounts.models import User | 6 | from colab.accounts.models import User |
7 | from colab_spb.models import CommunityAssociations | 7 | from colab_spb.models import CommunityAssociations |
8 | 8 |