Added custom title string for app label

hellosteadman · May 24, 2014 · 4527029 · 4527029
1 parent 6088a9f
commit 4527029
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/bambu_api/migrations/0001_initial.py b/bambu_api/migrations/0001_initial.py
@@ -22,7 +22,7 @@ def forwards(self, orm):
             ('http_login', self.gf('django.db.models.fields.BooleanField')(default=False)),
             ('http_signup', self.gf('django.db.models.fields.BooleanField')(default=False)),
         ))
-        db.send_create_signal(u'bambu_api', ['App'])
+        db.send_create_signal('bambu_api', ['App'])
 
         # Adding model 'Nonce'
         db.create_table('api_nonce', (
@@ -31,7 +31,7 @@ def forwards(self, orm):
             ('consumer_key', self.gf('django.db.models.fields.CharField')(max_length=32)),
             ('key', self.gf('django.db.models.fields.CharField')(max_length=255)),
         ))
-        db.send_create_signal(u'bambu_api', ['Nonce'])
+        db.send_create_signal('bambu_api', ['Nonce'])
 
         # Adding model 'Token'
         db.create_table('api_token', (
@@ -40,14 +40,14 @@ def forwards(self, orm):
             ('secret', self.gf('django.db.models.fields.CharField')(max_length=32)),
             ('verifier', self.gf('django.db.models.fields.CharField')(max_length=10)),
             ('token_type', self.gf('django.db.models.fields.PositiveIntegerField')()),
-            ('timestamp', self.gf('django.db.models.fields.PositiveIntegerField')(default=1400379175L)),
+            ('timestamp', self.gf('django.db.models.fields.PositiveIntegerField')(default=1400931659L)),
             ('approved', self.gf('django.db.models.fields.BooleanField')(default=False)),
             ('user', self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='tokens', null=True, to=orm['auth.User'])),
             ('app', self.gf('django.db.models.fields.related.ForeignKey')(related_name='tokens', to=orm['bambu_api.App'])),
             ('callback', self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True)),
             ('callback_confirmed', self.gf('django.db.models.fields.BooleanField')(default=False)),
         ))
-        db.send_create_signal(u'bambu_api', ['Token'])
+        db.send_create_signal('bambu_api', ['Token'])
 
         # Adding model 'RequestBatch'
         db.create_table('api_requestbatch', (
@@ -56,7 +56,7 @@ def forwards(self, orm):
             ('timestamp', self.gf('django.db.models.fields.PositiveIntegerField')(default=0)),
             ('count', self.gf('django.db.models.fields.PositiveIntegerField')(default=1)),
         ))
-        db.send_create_signal(u'bambu_api', ['RequestBatch'])
+        db.send_create_signal('bambu_api', ['RequestBatch'])
 
         # Adding unique constraint on 'RequestBatch', fields ['app', 'timestamp']
         db.create_unique('api_requestbatch', ['app_id', 'timestamp'])
@@ -109,7 +109,7 @@ def backwards(self, orm):
             'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
             'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
         },
-        u'bambu_api.app': {
+        'bambu_api.app': {
             'Meta': {'ordering': "('name',)", 'object_name': 'App', 'db_table': "'api_app'"},
             'admin': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'owned_apps'", 'to': u"orm['auth.User']"}),
             'callback_url': ('django.db.models.fields.URLField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
@@ -123,30 +123,30 @@ def backwards(self, orm):
             'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
             'status': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'})
         },
-        u'bambu_api.nonce': {
+        'bambu_api.nonce': {
             'Meta': {'object_name': 'Nonce', 'db_table': "'api_nonce'"},
             'consumer_key': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'key': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
             'token_key': ('django.db.models.fields.CharField', [], {'max_length': '18'})
         },
-        u'bambu_api.requestbatch': {
+        'bambu_api.requestbatch': {
             'Meta': {'unique_together': "(('app', 'timestamp'),)", 'object_name': 'RequestBatch', 'db_table': "'api_requestbatch'"},
-            'app': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'requests'", 'to': u"orm['bambu_api.App']"}),
+            'app': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'requests'", 'to': "orm['bambu_api.App']"}),
             'count': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'timestamp': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'})
         },
-        u'bambu_api.token': {
+        'bambu_api.token': {
             'Meta': {'object_name': 'Token', 'db_table': "'api_token'"},
-            'app': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tokens'", 'to': u"orm['bambu_api.App']"}),
+            'app': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'tokens'", 'to': "orm['bambu_api.App']"}),
             'approved': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'callback': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
             'callback_confirmed': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'key': ('django.db.models.fields.CharField', [], {'max_length': '18'}),
             'secret': ('django.db.models.fields.CharField', [], {'max_length': '32'}),
-            'timestamp': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1400379175L'}),
+            'timestamp': ('django.db.models.fields.PositiveIntegerField', [], {'default': '1400931659L'}),
             'token_type': ('django.db.models.fields.PositiveIntegerField', [], {}),
             'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'tokens'", 'null': 'True', 'to': u"orm['auth.User']"}),
             'verifier': ('django.db.models.fields.CharField', [], {'max_length': '10'})

diff --git a/bambu_api/models.py b/bambu_api/models.py
@@ -10,6 +10,10 @@
 
 REQUEST_LOGGER = helpers.get_request_logger()
 
+class CustomTitleString(str):
+    def title(self):
+        return str(self[6:]).title()
+
 class App(models.Model):
 	admin = models.ForeignKey(User, related_name = 'owned_apps')
 	name = models.CharField(max_length = 50)
@@ -73,7 +77,7 @@ def users(self):
 	class Meta:
 		ordering = ('name',)
 		db_table = 'api_app'
-		app_label = 'api'
+		app_label = CustomTitleString('bambu_api')
 
 class Nonce(models.Model):
 	token_key = models.CharField(max_length = 18)
@@ -85,7 +89,7 @@ def __unicode__(self):
 
 	class Meta:
 	    db_table = 'api_nonce'
-	    app_label = 'api'
+	    app_label = CustomTitleString('bambu_api')
 
 class Token(models.Model):
 	key = models.CharField(max_length = 18)
@@ -166,7 +170,7 @@ def set_callback(self, callback):
 
 	class Meta:
 	    db_table = 'api_token'
-	    app_label = 'api'
+	    app_label = CustomTitleString('bambu_api')
 
 class RequestBatch(models.Model):
 	app = models.ForeignKey(App, related_name = 'requests')
@@ -176,4 +180,4 @@ class RequestBatch(models.Model):
 	class Meta:
 		unique_together = ('app', 'timestamp')
 		db_table = 'api_requestbatch'
-		app_label = 'api'
+		app_label = CustomTitleString('bambu_api')