Merge pull request #1696 from learning-unlimited/mgersh-dead-code

Completely delete the datatree, userbits, and some less interesting things

Author: benjaminjkraft

esp/esp/accounting/migrations/0007_add_options_fkey.py

@@ -6,7 +6,9 @@
 
 
 class Migration(SchemaMigration):
-
+    depends_on = (
+        ("accounting_core", "0001_initial"),
+    )
     def forwards(self, orm):
         # Adding field 'Transfer.options'
         db.add_column('accounting_transfer', 'option',

esp/esp/accounting_core/migrations/0002_del_accounting_core.py

@@ -7,6 +7,10 @@
 
 class Migration(SchemaMigration):
 
+    depends_on = (
+        ("accounting_docs", "0001_initial"),
+    )
+
     def forwards(self, orm):
         # Deleting model 'LineItemType'
         db.delete_table('accounting_core_lineitemtype')

esp/esp/accounting_docs/migrations/0001_initial.py

@@ -7,6 +7,10 @@
 
 class Migration(SchemaMigration):
 
+    depends_on = (
+        ("accounting_core", "0001_initial"),
+    )
+
     def forwards(self, orm):
         # Adding model 'PurchaseOrder'
         db.create_table('accounting_docs_purchaseorder', (

esp/esp/application/models.py

@@ -226,7 +226,7 @@ def get_subject(s):
                 return None
             except ValueError:
                 cls_title = val.strip()
-                clses = program.classes().filter(anchor__friendly_name=cls_title)
+                clses = program.classes().filter(title=cls_title)
                 if clses:
                     return clses[0]
                 else:

esp/esp/cal/models.py

@@ -33,7 +33,6 @@
   Email: [email protected]
 """
 from django.db import models
-from esp.datatree.models import *
 from datetime import datetime, timedelta
 from esp.cache import cache_function
 

esp/esp/cal/templatetags/__init__.py

@@ -1,35 +0,0 @@
-
-__author__    = "Individual contributors (see AUTHORS file)"
-__date__      = "$DATE$"
-__rev__       = "$REV$"
-__license__   = "AGPL v.3"
-__copyright__ = """
-This file is part of the ESP Web Site
-Copyright (c) 2007 by the individual contributors
-  (see AUTHORS file)
-
-The ESP Web Site is free software; you can redistribute it and/or
-modify it under the terms of the GNU Affero General Public License
-as published by the Free Software Foundation; either version 3
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Contact information:
-MIT Educational Studies Program
-  84 Massachusetts Ave W20-467, Cambridge, MA 02139
-  Phone: 617-253-4882
-  Email: [email protected]
-Learning Unlimited, Inc.
-  527 Franklin St, Cambridge, MA 02139
-  Phone: 617-379-0178
-  Email: [email protected]
-"""
-

esp/esp/datatree/AUTHORS

@@ -4,7 +4,6 @@
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
-from esp.datatree.models import install as datatree_install
 from django.conf import settings
 
 

esp/esp/datatree/__init__.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    depends_on = (
+        ("accounting_core", "0002_del_accounting_core"),
+        ("miniblog", "0003_remove_anchor"),
+        ("modules", "0029_module_ext_unused_model_removal"),
+        ("program", "0046_delete_anchors"),
+        ("qsdmedia", "0008_auto__del_field_media_anchor"),
+        ("survey", "0004_anchor_replacement_3"),
+        ("web", "0006_auto__del_field_navbarentry_path"),
+    )
+
+    def forwards(self, orm):
+        # Removing unique constraint on 'DataTree', fields ['name', 'parent']
+        try:
+            db.delete_unique('datatree_datatree', ['name', 'parent_id'])
+        except ValueError:
+            # Not sure why South thinks the unique constraint existed but my database
+            # doesn't; ignore the error
+            pass
+
+        # Deleting model 'DataTree'
+        db.delete_table('datatree_datatree')
+
+
+    def backwards(self, orm):
+        # Adding model 'DataTree'
+        db.create_table('datatree_datatree', (
+            ('parent', self.gf('django.db.models.fields.related.ForeignKey')(related_name='child_set', null=True, to=orm['datatree.DataTree'], blank=True)),
+            ('rangestart', self.gf('django.db.models.fields.IntegerField')()),
+            ('range_correct', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('uri_correct', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
+            ('rangeend', self.gf('django.db.models.fields.IntegerField')()),
+            ('friendly_name', self.gf('django.db.models.fields.TextField')()),
+            ('uri', self.gf('django.db.models.fields.CharField')(max_length=1024)),
+            ('lock_table', self.gf('django.db.models.fields.IntegerField')(default=0)),
+        ))
+        db.send_create_signal('datatree', ['DataTree'])
+
+        # Adding unique constraint on 'DataTree', fields ['name', 'parent']
+        db.create_unique('datatree_datatree', ['name', 'parent_id'])
+
+
+    models = {
+        
+    }
+
+    complete_apps = ['datatree']

esp/esp/datatree/admin.py

@@ -1,84 +0,0 @@
-__author__    = "Individual contributors (see AUTHORS file)"
-__date__      = "$DATE$"
-__rev__       = "$REV$"
-__license__   = "AGPL v.3"
-__copyright__ = """
-This file is part of the ESP Web Site
-Copyright (c) 2008 by the individual contributors
-  (see AUTHORS file)
-
-The ESP Web Site is free software; you can redistribute it and/or
-modify it under the terms of the GNU Affero General Public License
-as published by the Free Software Foundation; either version 3
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public
-License along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-Contact information:
-MIT Educational Studies Program
-  84 Massachusetts Ave W20-467, Cambridge, MA 02139
-  Phone: 617-253-4882
-  Email: [email protected]
-Learning Unlimited, Inc.
-  527 Franklin St, Cambridge, MA 02139
-  Phone: 617-379-0178
-  Email: [email protected]
-"""
-from django.db import models
-from esp.db.fields import AjaxForeignKey
-
-__all__ = ('DataTree',)
-
-"""
-    DataTree models kept for data storage; functionality removed.
-"""
-
-class DataTree(models.Model):
-
-    lock_choices = (
-        (0, "UNLOCKED"),
-        (1, "SOFT LOCK"),
-        (2, "HARD LOCK"),
-    )
-
-    # some fields
-    name          = models.CharField(max_length=64)
-    friendly_name = models.TextField()
-    parent        = AjaxForeignKey('self',blank=True,null=True, related_name='child_set')
-    rangestart    = models.IntegerField(editable = False)
-    rangeend      = models.IntegerField(editable = False)
-    uri           = models.CharField(editable = False, max_length=1024)
-    #^ a charfield for indexing purposes
-    uri_correct   = models.BooleanField(editable = False, default = False)
-    lock_table    = models.IntegerField(editable = False, default = 0,
-                                        choices  = lock_choices)
-    range_correct = models.BooleanField(editable = False, default = True )
-
-    class Meta:
-        # parent and name should be unique
-        unique_together = (("name", "parent"),)
-        # ordering should be by rangestart
-        #ordering = ['rangestart','-rangeend']
-
-    class Admin:
-        ordering = ('rangestart', '-rangeend')
-
-    def delete(self, recurse = False, superdelete = False):
-        raise Exception('Attempted to delete a DataTree')
-
-    def save(self, create_root=False, uri_fix=False, old_save=False, start_size=None, *args, **kwargs):
-        raise Exception('Attempted to save a DataTree')
-
-def GetNode(uri):
-    #   This no longer creates on demand, so it should not be used in active code.
-    return DataTree.objects.get(uri=uri)
-
-def install():
-    pass