Changeset d241a05

Timestamp:

Aug 5, 2011, 2:41:09 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

a8d80c2

Parents:

7db8f3b

git-author:

Alex Dehnert <adehnert@…> (08/05/11 02:41:09)

git-committer:

Alex Dehnert <adehnert@…> (08/05/11 02:41:09)

Message:

Rename AthenaMoiraPerson? to AthenaMoiraAccount?

The old name was stupid. Note that I didn't do a migration,
so if you deployed the previous commit, you'll need to do
ALTER TABLE yourself.

Location:

asadb/groups

Files:

• admin.py (modified) (2 diffs)
• load_people.py (modified) (2 diffs)
• migrations/0003_add_people.py (modified) (3 diffs)
• models.py (modified) (2 diffs)

asadb/groups/admin.py

@@ -59 +59 @@
     list_display_links = ('id', 'name', )
 
-class Admin_AthenaMoiraPerson(admin.ModelAdmin):
+class Admin_AthenaMoiraAccount(admin.ModelAdmin):
     list_display = (
         'id',
@@ -79 +79 @@
 admin.site.register(groups.models.OfficerRole, OfficerRoleAdmin)
 admin.site.register(groups.models.OfficeHolder, OfficeHolderAdmin)
-admin.site.register(groups.models.AthenaMoiraPerson, Admin_AthenaMoiraPerson)
+admin.site.register(groups.models.AthenaMoiraAccount, Admin_AthenaMoiraAccount)

asadb/groups/load_people.py

@@ -40 +40 @@
 @transaction.commit_manually
 def load_people(dcm_people):
-    django_people = groups.models.AthenaMoiraPerson.objects.all()
+    django_people = groups.models.AthenaMoiraAccount.objects.all()
     stat_loops = 0
     stat_django_people = len(django_people)
@@ -96 +96 @@
             transaction.commit()
             pass
-        django_person = groups.models.AthenaMoiraPerson()
+        django_person = groups.models.AthenaMoiraAccount()
         for key in fields:
             django_person.__dict__[key] = dcm_person[key]

asadb/groups/migrations/0003_add_people.py

@@ -9 +9 @@
     def forwards(self, orm):
         
-        # Adding model 'AthenaMoiraPerson'
-        db.create_table('groups_athenamoiraperson', (
+        # Adding model 'AthenaMoiraAccount'
+        db.create_table('groups_athenamoiraaccount', (
             ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('username', self.gf('django.db.models.fields.CharField')(max_length=8)),
@@ -22 +22 @@
             ('mod_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
         ))
-        db.send_create_signal('groups', ['AthenaMoiraPerson'])
+        db.send_create_signal('groups', ['AthenaMoiraAccount'])
 
 
     def backwards(self, orm):
         
-        # Deleting model 'AthenaMoiraPerson'
-        db.delete_table('groups_athenamoiraperson')
+        # Deleting model 'AthenaMoiraAccount'
+        db.delete_table('groups_athenamoiraaccount')
 
 
@@ -37 +37 @@
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'groups.athenamoiraperson': {
-            'Meta': {'object_name': 'AthenaMoiraPerson'},
+        'groups.athenamoiraaccount': {
+            'Meta': {'object_name': 'AthenaMoiraAccount'},
             'account_class': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
             'add_date': ('django.db.models.fields.DateField', [], {}),

asadb/groups/models.py

@@ -101 +101 @@
 
 
-class AthenaMoiraPerson(models.Model):
+class AthenaMoiraAccount(models.Model):
     username = models.CharField(max_length=8)
     mit_id = models.CharField(max_length=15)
@@ -116 +116 @@
         else:
             mutable_str = " (immutable)"
-        return "<AthenaMoiraPerson: username=%s name='%s, %s' account_class=%s%s>" % (
+        return "<AthenaMoiraAccount: username=%s name='%s, %s' account_class=%s%s>" % (
             self.username, self.last_name, self.first_name,
             self.account_class, mutable_str,