Skip to content

Commit 980d4e6

Browse files
OleLaursenOleLaursen
committed
Move new schema models from redesign/ to ietf/
 - Legacy-Id: 3855
1 parent 6cfb040 commit 980d4e6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+300
-485
lines changed

‎ietf/announcements/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class Meta:
9191
if settings.USE_DB_REDESIGN_PROXY_CLASSES or hasattr(settings, "IMPORTING_FROM_OLD_SCHEMA"):
9292
import datetime
9393

94-
from person.models import Email, Person
95-
from group.models import Group
94+
from ietf.person.models import Email, Person
95+
from ietf.group.models import Group
9696

9797
class Message(models.Model):
9898
time = models.DateTimeField(default=datetime.datetime.now)

‎ietf/announcements/tests.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class SendScheduledAnnouncementsTestCaseREDESIGN(django.test.TestCase):
6868

6969
def test_send_plain_announcement(self):
7070
from ietf.announcements.models import Message, SendQueue
71-
from redesign.person.models import Person
71+
from ietf.person.models import Person
7272

7373
make_test_data()
7474

@@ -100,7 +100,7 @@ def test_send_plain_announcement(self):
100100

101101
def test_send_mime_announcement(self):
102102
from ietf.announcements.models import Message, SendQueue
103-
from redesign.person.models import Person
103+
from ietf.person.models import Person
104104

105105
make_test_data()
106106

‎ietf/announcements/views.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def nomcom(request):
3535
'regimes' : regimes })
3636

3737
def nomcomREDESIGN(request):
38-
from group.models import Group, GroupEvent
38+
from ietf.group.models import Group, GroupEvent
3939
from ietf.announcements.models import Message
4040

4141
address_re = re.compile("<.*>")
@@ -74,7 +74,7 @@ def nomcomREDESIGN(request):
7474

7575

7676
def message_detail(request, object_id, queryset):
77-
from group.models import Group
77+
from ietf.group.models import Group
7878
from ietf.announcements.models import Message
7979

8080
# restrict to nomcom announcements for the time being

redesign/doc/__init__.py renamed to ietf/doc/__init__.py

File renamed without changes.

redesign/doc/admin.py renamed to ietf/doc/admin.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
from django import forms
44

55
from models import *
6-
from redesign.person.models import *
7-
from redesign.doc.utils import get_state_types
6+
from ietf.person.models import *
7+
from ietf.doc.utils import get_state_types
8+
from ietf.utils.admin import admin_link
89

910
class StateTypeAdmin(admin.ModelAdmin):
1011
list_display = ["slug", "label"]
@@ -105,6 +106,7 @@ class DocAliasAdmin(admin.ModelAdmin):
105106
list_display = [ 'name', 'document_link', ]
106107
search_fields = [ 'name', 'document__name', ]
107108
raw_id_fields = ['document']
109+
document_link = admin_link("document")
108110
admin.site.register(DocAlias, DocAliasAdmin)
109111

110112

redesign/doc/models.py renamed to ietf/doc/models.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
from django.core.urlresolvers import reverse as urlreverse
55
from django.conf import settings
66

7-
from redesign.group.models import *
8-
from redesign.name.models import *
9-
from redesign.person.models import Email, Person
10-
from redesign.util import admin_link
7+
from ietf.group.models import *
8+
from ietf.name.models import *
9+
from ietf.person.models import Email, Person
1110

1211
import datetime, os
1312

@@ -252,7 +251,6 @@ class DocAlias(models.Model):
252251
name = models.CharField(max_length=255, db_index=True)
253252
def __unicode__(self):
254253
return "%s-->%s" % (self.name, self.document.name)
255-
document_link = admin_link("document")
256254
class Meta:
257255
verbose_name = "document alias"
258256
verbose_name_plural = "document aliases"

redesign/doc/proxy.py renamed to ietf/doc/proxy.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from redesign.doc.models import *
2-
from redesign.person.models import Email
3-
from redesign.proxy_utils import TranslatingManager
4-
from redesign.name.proxy import *
1+
from ietf.doc.models import *
2+
from ietf.person.models import Email
3+
from ietf.utils.proxy import TranslatingManager
4+
from ietf.name.proxy import *
55

66
from django.conf import settings
77

@@ -573,7 +573,7 @@ def ballot_issued(self):
573573
def active_positions(self):
574574
"""Returns a list of dicts, with AD and Position tuples"""
575575
from person.proxy import IESGLogin as IESGLoginProxy
576-
from redesign.doc.utils import active_ballot_positions
576+
from ietf.doc.utils import active_ballot_positions
577577

578578
res = []
579579
for ad, pos in active_ballot_positions(self).iteritems():

redesign/doc/utils.py renamed to ietf/doc/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from redesign.doc.models import *
1+
from ietf.doc.models import *
22

33
def get_state_types(doc):
44
res = []

redesign/group/__init__.py renamed to ietf/group/__init__.py

File renamed without changes.

redesign/group/admin.py renamed to ietf/group/admin.py

File renamed without changes.

0 commit comments

Comments
 (0)