Download as
Browse Code »

Commit 371644a89306b4dfe38a7b250fb060cf56e1136e

Authored by Luan
1 parent 33136de0
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Adding order field to badger

Showing 3 changed files with 93 additions and 0 deletions   Show diff stats
src/badger/admin.py
  Diff comments   View file @371644a
... ... @@ -12,6 +12,8 @@ class BadgeI18NInline(admin.TabularInline):
12 12  
13 13 class BadgeAdmin(admin.ModelAdmin):
14 14 inlines = [BadgeI18NInline, ]
  15 + list_display = ['title', 'description', 'order']
  16 + list_editable = ['order', ]
15 17  
16 18  
17 19 admin.site.register(Badge, BadgeAdmin)
... ...
src/badger/migrations/0004_auto__add_field_badge_order.py 0 → 100644
  Diff comments   View file @371644a
... ... @@ -0,0 +1,89 @@
  1 +# -*- coding: utf-8 -*-
  2 +import datetime
  3 +from south.db import db
  4 +from south.v2 import SchemaMigration
  5 +from django.db import models
  6 +
  7 +
  8 +class Migration(SchemaMigration):
  9 +
  10 + def forwards(self, orm):
  11 + # Adding field 'Badge.order'
  12 + db.add_column(u'badger_badge', 'order',
  13 + self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=100),
  14 + keep_default=False)
  15 +
  16 +
  17 + def backwards(self, orm):
  18 + # Deleting field 'Badge.order'
  19 + db.delete_column(u'badger_badge', 'order')
  20 +
  21 +
  22 + models = {
  23 + u'accounts.user': {
  24 + 'Meta': {'object_name': 'User'},
  25 + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  26 + 'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
  27 + 'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  28 + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  29 + 'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
  30 + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
  31 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  32 + 'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  33 + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
  34 + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  35 + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
  36 + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
  37 + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
  38 + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
  39 + 'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  40 + 'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
  41 + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
  42 + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
  43 + 'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
  44 + 'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
  45 + },
  46 + u'auth.group': {
  47 + 'Meta': {'object_name': 'Group'},
  48 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  49 + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
  50 + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
  51 + },
  52 + u'auth.permission': {
  53 + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
  54 + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  55 + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
  56 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  57 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
  58 + },
  59 + u'badger.badge': {
  60 + 'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
  61 + 'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
  62 + 'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
  63 + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  64 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  65 + 'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
  66 + 'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
  67 + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  68 + 'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
  69 + 'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
  70 + 'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
  71 + },
  72 + u'badger.badgei18n': {
  73 + 'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
  74 + 'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
  75 + 'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
  76 + 'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
  77 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  78 + 'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
  79 + },
  80 + u'contenttypes.contenttype': {
  81 + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
  82 + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  83 + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
  84 + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
  85 + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
  86 + }
  87 + }
  88 +
  89 + complete_apps = ['badger']
0 90 \ No newline at end of file
... ...
src/badger/models.py
  Diff comments   View file @371644a
... ... @@ -64,10 +64,12 @@ class Badge(models.Model):
64 64 blank=True,
65 65 null=True
66 66 )
  67 + order = models.PositiveSmallIntegerField(_(u'Order'), default=100)
67 68  
68 69 class Meta:
69 70 verbose_name = _(u'Badge')
70 71 verbose_name_plural = _(u'Badges')
  72 + ordering = ['order', ]
71 73  
72 74 def get_badge_url(self):
73 75 return u'{}{}'.format(settings.MEDIA_URL, self.image)
... ...