Browse Source

Changed field name from style to css_class

Rafał Pitoń 11 years ago
parent
commit
550c7275fb

+ 1 - 1
misago/templates/misago/admin/ranks/form.html

@@ -50,7 +50,7 @@
   <fieldset>
   <fieldset>
     <legend>{% trans "Display and visibility" %}</legend>
     <legend>{% trans "Display and visibility" %}</legend>
 
 
-    {{ form.style|as_crispy_field }}
+    {{ form.css_class|as_crispy_field }}
     {{ form.is_tab|as_crispy_field }}
     {{ form.is_tab|as_crispy_field }}
     {{ form.is_on_index|as_crispy_field }}
     {{ form.is_on_index|as_crispy_field }}
 
 

+ 2 - 2
misago/users/forms/admin.py

@@ -24,7 +24,7 @@ class RankForm(forms.ModelForm):
         label=_("User roles"), queryset=Role.objects.order_by('name'),
         label=_("User roles"), queryset=Role.objects.order_by('name'),
         required=False,  widget=forms.CheckboxSelectMultiple,
         required=False,  widget=forms.CheckboxSelectMultiple,
         help_text=_('Rank can give users with it additional roles.'))
         help_text=_('Rank can give users with it additional roles.'))
-    style = forms.CharField(
+    css_class = forms.CharField(
         label=_("CSS class"), required=False,
         label=_("CSS class"), required=False,
         help_text=_("Optional css class added to content belonging to this "
         help_text=_("Optional css class added to content belonging to this "
                     "rank owner."))
                     "rank owner."))
@@ -44,7 +44,7 @@ class RankForm(forms.ModelForm):
         fields = [
         fields = [
             'name',
             'name',
             'description',
             'description',
-            'style',
+            'css_class',
             'title',
             'title',
             'roles',
             'roles',
             'is_tab',
             'is_tab',

+ 2 - 2
misago/users/migrations/0003_default_ranks.py

@@ -15,7 +15,7 @@ class Migration(SchemaMigration):
                             name=_("Forum Team").message,
                             name=_("Forum Team").message,
                             slug='forum-team',
                             slug='forum-team',
                             title=_("Team").message,
                             title=_("Team").message,
-                            style='team',
+                            css_class='team',
                             order=0,
                             order=0,
                             is_tab=True,
                             is_tab=True,
                             is_on_index=True,
                             is_on_index=True,
@@ -25,7 +25,7 @@ class Migration(SchemaMigration):
                             name=_("Most Valuable Posters").message,
                             name=_("Most Valuable Posters").message,
                             slug='most-valuable-posters',
                             slug='most-valuable-posters',
                             title=_("MVP").message,
                             title=_("MVP").message,
-                            style='mvp',
+                            css_class='mvp',
                             order=1,
                             order=1,
                             is_tab=True,
                             is_tab=True,
                             )
                             )

+ 89 - 0
misago/users/migrations/0005_auto__del_field_rank_style__add_field_rank_css_class.py

@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+from south.utils import datetime_utils as datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Deleting field 'Rank.style'
+        db.delete_column(u'users_rank', 'style')
+
+        # Adding field 'Rank.css_class'
+        db.add_column(u'users_rank', 'css_class',
+                      self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Adding field 'Rank.style'
+        db.add_column(u'users_rank', 'style',
+                      self.gf('django.db.models.fields.CharField')(max_length=255, null=True, blank=True),
+                      keep_default=False)
+
+        # Deleting field 'Rank.css_class'
+        db.delete_column(u'users_rank', 'css_class')
+
+
+    models = {
+        u'acl.role': {
+            'Meta': {'object_name': 'Role'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'pickled_permissions': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'users.rank': {
+            'Meta': {'object_name': 'Rank'},
+            'css_class': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_default': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_on_index': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_tab': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'roles': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['acl.Role']", 'null': 'True', 'blank': 'True'}),
+            'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'})
+        },
+        'users.user': {
+            'Meta': {'object_name': 'User'},
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'db_index': 'True'}),
+            'email_hash': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '32'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'joined_on': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'rank': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['users.Rank']", 'on_delete': 'models.PROTECT'}),
+            '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', [], {'max_length': '30'}),
+            'username_slug': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        }
+    }
+
+    complete_apps = ['users']

+ 1 - 1
misago/users/models/rankmodel.py

@@ -22,7 +22,7 @@ class Rank(models.Model):
     description = models.TextField(null=True, blank=True)
     description = models.TextField(null=True, blank=True)
     title = models.CharField(max_length=255, null=True, blank=True)
     title = models.CharField(max_length=255, null=True, blank=True)
     roles = models.ManyToManyField('acl.Role', null=True, blank=True)
     roles = models.ManyToManyField('acl.Role', null=True, blank=True)
-    style = models.CharField(max_length=255, null=True, blank=True)
+    css_class = models.CharField(max_length=255, null=True, blank=True)
     is_default = models.BooleanField(default=False)
     is_default = models.BooleanField(default=False)
     is_tab = models.BooleanField(default=False)
     is_tab = models.BooleanField(default=False)
     is_on_index = models.BooleanField(default=False)
     is_on_index = models.BooleanField(default=False)