Added redesign work-in-progress

 - Legacy-Id: 2686

Author: OleLaursen

django/shortcuts/__init__.py

@@ -98,4 +98,4 @@ def get_list_or_404(klass, *args, **kwargs):
     obj_list = list(queryset.filter(*args, **kwargs))
     if not obj_list:
         raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
-    return obj_list
+    return obj_list

ietf/idrfc/idrfc_wrapper.py

@@ -36,6 +36,7 @@
 from datetime import date
 from django.utils import simplejson as json
 from django.db.models import Q
+from django.conf import settings
 import types
 
 BALLOT_ACTIVE_STATES = ['In Last Call',
@@ -602,8 +603,64 @@ def ballot_set_other(self):
             return []
         else:
             return self._ballot_set.exclude(draft=self._idinternal)
-    
+
     def _init(self):
+        if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+            self.old_init()
+            return
+
+        from redesign.person.models import Email
+        active_ads = Email.objects.filter(role__name="ad", role__group__state="active")
+        
+        positions = []
+        seen = {}
+
+	for pos in self.ballot.event_set.filter(type="changed_ballot_position").select_related('pos', 'ad').order_by("-time", '-id'):
+            pos = pos.ballotposition
+            if pos.ad not in seen:
+                p = dict(ad_name=pos.ad.get_name(),
+                         ad_username="", # FIXME: don't seem to have username at the moment
+                         position=pos.pos.name,
+                         is_old_ad=pos.ad in active_ads,
+                         old_positions=[])
+
+                if pos.pos.slug == "discuss":
+                    p["has_text"] = True
+                    p["discuss_text"] = pos.discuss
+                    p["discuss_date"] = pos.discuss_time
+                    p["discuss_revision"] = pos.doc.rev # FIXME: wrong
+
+                if pos.comment:
+                    p["has_text"] = True
+                    p["comment_text"] = pos.comment
+                    p["comment_date"] = pos.comment_time
+                    p["comment_revision"] = pos.doc.rev # FIXME: wrong
+
+                positions.append(p)
+                seen[pos.ad] = p
+            else:
+                latest = seen[pos.ad]
+                if latest["old_positions"]:
+                    prev = latest["old_positions"][-1]
+                else:
+                    prev = latest["position"]
+                    
+                if prev != pos.pos.name:
+                    seen[pos.ad]["old_positions"].append(pos.pos.name)
+
+        # add any missing ADs as No Record
+        if self.ballot_active:
+            for ad in active_ads:
+                if ad not in seen:
+                    d = dict(ad_name=ad.get_name(),
+                             ad_username="", # FIXME: don't seem to have username at the moment
+                             position="No Record",
+                             )
+                    positions.append(d)
+                
+        self._positions = positions
+        
+    def old_init(self):
         try:
             ads = set()
         except NameError:

ietf/idrfc/views_doc.py

@@ -147,21 +147,32 @@ def document_main(request, name):
 # doc is either IdWrapper or RfcWrapper
 def _get_history(doc, versions):
     results = []
-    if doc.is_id_wrapper:
-        comments = DocumentComment.objects.filter(document=doc.tracker_id).exclude(rfc_flag=1)
+    if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+        for e in doc._draft.event_set.all().select_related('by').order_by('-time'):
+            info = {}
+            info['text'] = e.desc
+            info['by'] = e.by.get_name()
+            info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
+            info['snipped'] = info['textSnippet'][-3:] == "..."
+            e.version = e.doc.rev
+            results.append({'comment':e, 'info':info, 'date':e.time, 'is_com':True})
     else:
-        comments = DocumentComment.objects.filter(document=doc.rfc_number,rfc_flag=1)
-        if len(comments) > 0:
-            # also include rfc_flag=NULL, but only if at least one
-            # comment with rfc_flag=1 exists (usually NULL means same as 0)
-            comments = DocumentComment.objects.filter(document=doc.rfc_number).exclude(rfc_flag=0)
-    for comment in comments.order_by('-date','-time','-id').filter(public_flag=1).select_related('created_by'):
-        info = {}
-        info['text'] = comment.comment_text
-        info['by'] = comment.get_fullname()
-        info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
-        info['snipped'] = info['textSnippet'][-3:] == "..."
-        results.append({'comment':comment, 'info':info, 'date':comment.datetime(), 'is_com':True})
+        if doc.is_id_wrapper:
+            comments = DocumentComment.objects.filter(document=doc.tracker_id).exclude(rfc_flag=1)
+        else:
+            comments = DocumentComment.objects.filter(document=doc.rfc_number,rfc_flag=1)
+            if len(comments) > 0:
+                # also include rfc_flag=NULL, but only if at least one
+                # comment with rfc_flag=1 exists (usually NULL means same as 0)
+                comments = DocumentComment.objects.filter(document=doc.rfc_number).exclude(rfc_flag=0)
+        for comment in comments.order_by('-date','-time','-id').filter(public_flag=1).select_related('created_by'):
+            info = {}
+            info['text'] = comment.comment_text
+            info['by'] = comment.get_fullname()
+            info['textSnippet'] = truncatewords_html(format_textarea(fill(info['text'], 80)), 25)
+            info['snipped'] = info['textSnippet'][-3:] == "..."
+            results.append({'comment':comment, 'info':info, 'date':comment.datetime(), 'is_com':True})
+    
     if doc.is_id_wrapper and versions:
         for v in versions:
             if v['draft_name'] == doc.draft_name:

ietf/idtracker/admin.py

@@ -1,14 +1,17 @@
 #coding: utf-8
 from django.contrib import admin
+from django.conf import settings
 from ietf.idtracker.models import *
-                
-class AcronymAdmin(admin.ModelAdmin):
-    list_display=('acronym', 'name')
-admin.site.register(Acronym, AcronymAdmin)
 
-class AreaAdmin(admin.ModelAdmin):
-    list_display=('area_acronym', 'status')
-admin.site.register(Area, AreaAdmin)
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    class AcronymAdmin(admin.ModelAdmin):
+        list_display=('acronym', 'name')
+    admin.site.register(Acronym, AcronymAdmin)
+
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    class AreaAdmin(admin.ModelAdmin):
+        list_display=('area_acronym', 'status')
+    admin.site.register(Area, AreaAdmin)
 
 class AreaDirectorAdmin(admin.ModelAdmin):
     raw_id_fields=['person']
@@ -96,12 +99,13 @@ class IRTFAdmin(admin.ModelAdmin):
     pass
 admin.site.register(IRTF, IRTFAdmin)
 
-class InternetDraftAdmin(admin.ModelAdmin):
-    list_display=('filename', 'revision', 'title', 'status')
-    search_fields=['filename', 'title']
-    list_filter=['status']
-    raw_id_fields=['replaced_by']
-admin.site.register(InternetDraft, InternetDraftAdmin)
+if not settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    class InternetDraftAdmin(admin.ModelAdmin):
+        list_display=('filename', 'revision', 'title', 'status')
+        search_fields=['filename', 'title']
+        list_filter=['status']
+        raw_id_fields=['replaced_by']
+    admin.site.register(InternetDraft, InternetDraftAdmin)
 
 class PersonOrOrgInfoAdmin(admin.ModelAdmin):
     fieldsets=((None, {'fields': (('first_name', 'middle_initial', 'last_name'), ('name_suffix', 'modified_by'))}), ('Obsolete Info', {'fields': ('record_type', 'created_by', 'address_type'), 'classes': 'collapse'}))

ietf/idtracker/models.py

@@ -1087,6 +1087,11 @@ class DocumentWrapper(object):
     def __init__(self, document):
 	self.document = document
 
+if settings.USE_DB_REDESIGN_PROXY_CLASSES:
+    from redesign.doc.proxy import InternetDraft
+    from redesign.group.proxy import Area
+    from redesign.group.proxy import Acronym
+
 
 # changes done by convert-096.py:changed maxlength to max_length
 # removed core

ietf/settings.py

@@ -8,9 +8,12 @@
 import syslog
 syslog.openlog("django", syslog.LOG_PID, syslog.LOG_LOCAL0)
 
-
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
+import sys
+sys.path.append(os.path.abspath(BASE_DIR + "/.."))
+sys.path.append(os.path.abspath(BASE_DIR + "/../redesign"))
+
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -118,6 +121,11 @@
     'django.contrib.admin',
     'django.contrib.humanize',
     'south',
+    'redesign.person',
+    'redesign.name',
+    'redesign.group',
+    'redesign.doc',
+    'redesign.issue',
     'ietf.announcements',
     'ietf.idindex',
     'ietf.idtracker',
@@ -187,6 +195,9 @@
 LIAISON_ATTACH_PATH = '/a/www/ietf-datatracker/documents/LIAISON/'
 LIAISON_ATTACH_URL = '/documents/LIAISON/'
 
+# DB redesign
+USE_DB_REDESIGN_PROXY_CLASSES=True
+
 # Put SECRET_KEY in here, or any other sensitive or site-specific
 # changes.  DO NOT commit settings_local.py to svn.
 from settings_local import *

redesign/__init__.py

@@ -0,0 +1,45 @@
+from django.contrib import admin
+from models import *
+from person.models import *
+
+class RelatedDocAdmin(admin.ModelAdmin):
+    list_display = ["source", "relationship", "target"]
+    search_fields = ["doc_alias__name", "related_document_set__name", ]
+    list_display_links = ["relationship", ]
+admin.site.register(RelatedDoc, RelatedDocAdmin)    
+
+class DocumentAdmin(admin.ModelAdmin):
+    list_display = ['name', 'rev', 'state', 'group', 'pages', 'intended_std_level', 'author_list', 'time']
+    search_fields = ['name']
+    raw_id_fields = ['authors', 'related', 'group', 'shepherd', 'ad']
+admin.site.register(Document, DocumentAdmin)
+
+class DocHistoryAdmin(admin.ModelAdmin):
+    list_display = ['doc', 'rev', 'state', 'group', 'pages', 'intended_std_level', 'author_list', 'time']
+    search_fields = ['doc__name']
+    ordering = ['time', 'doc', 'rev']
+    raw_id_fields = ['authors', 'related']
+admin.site.register(DocHistory, DocHistoryAdmin)
+
+class DocAliasAdmin(admin.ModelAdmin):
+    list_display = [ 'name', 'document_link', ]
+    search_fields = [ 'name', 'document__name', ]
+admin.site.register(DocAlias, DocAliasAdmin)
+
+class SendQueueAdmin(admin.ModelAdmin):
+    pass
+admin.site.register(SendQueue, SendQueueAdmin)
+
+
+# events
+
+class EventAdmin(admin.ModelAdmin):
+    raw_id_fields = ["doc", "by"]
+admin.site.register(Event, EventAdmin)
+
+admin.site.register(Message, EventAdmin)
+admin.site.register(Text, EventAdmin)
+admin.site.register(BallotPosition, EventAdmin)
+admin.site.register(Expiration, EventAdmin)
+admin.site.register(Telechat, EventAdmin)
+