dropped is_on_index rank flag

misago/templates/_misago/admin/ranks/form.html

@@ -58,7 +58,6 @@ class="form-horizontal"
 
     {% form_row form.css_class label_class field_class %}
     {% form_row form.is_tab "col-md-offset-3" field_class %}
-    {% form_row form.is_on_index "col-md-offset-3" field_class %}
 
   </fieldset>
   {% endwith %}

misago/templates/_misago/admin/ranks/list.html

@@ -43,9 +43,6 @@
   {% if item.is_tab %}
   <div class="fa fa-list tooltip-top" title="{% trans "Has page on users list." %}"></div>
   {% endif %}
-  {% if item.is_on_index %}
-  <div class="fa fa-bookmark tooltip-top" title="{% trans "Users online displayed on index." %}"></div>
-  {% endif %}
   {% if item.is_default %}
   <div class="fa fa-star tooltip-top" title="{% trans "This is default rank assigned to new members." %}"></div>
   {% endif %}

misago/templates/misago/admin/ranks/form.html

@@ -58,7 +58,6 @@ class="form-horizontal"
 
     {% form_row form.css_class label_class field_class %}
     {% form_row form.is_tab "col-md-offset-3" field_class %}
-    {% form_row form.is_on_index "col-md-offset-3" field_class %}
 
   </fieldset>
   {% endwith %}

misago/templates/misago/admin/ranks/list.html

@@ -43,9 +43,6 @@
   {% if item.is_tab %}
   <div class="fa fa-list tooltip-top" title="{% trans "Has page on users list." %}"></div>
   {% endif %}
-  {% if item.is_on_index %}
-  <div class="fa fa-bookmark tooltip-top" title="{% trans "Users online displayed on index." %}"></div>
-  {% endif %}
   {% if item.is_default %}
   <div class="fa fa-star tooltip-top" title="{% trans "This is default rank assigned to new members." %}"></div>
   {% endif %}

misago/users/forms/admin.py

@@ -6,24 +6,20 @@ from misago.core import forms, threadstore
 from misago.core.validators import validate_sluggable
 from misago.acl.models import Role
 
-from misago.users.models import (AUTO_SUBSCRIBE_CHOICES,
-                                 PRIVATE_THREAD_INVITES_LIMITS_CHOICES,
-                                 BANS_CHOICES, RESTRICTIONS_CHOICES,
-                                 Ban, Rank, WarningLevel)
-from misago.users.validators import (validate_username, validate_email,
-                                     validate_password)
+from misago.users.models import (
+    AUTO_SUBSCRIBE_CHOICES, PRIVATE_THREAD_INVITES_LIMITS_CHOICES,
+    BANS_CHOICES, RESTRICTIONS_CHOICES, Ban, Rank, WarningLevel)
+from misago.users.validators import (
+    validate_username, validate_email, validate_password)
 
 
 """
 Users
 """
 class UserBaseForm(forms.ModelForm):
-    username = forms.CharField(
-        label=_("Username"))
-    title = forms.CharField(
-        label=_("Custom title"), required=False)
-    email = forms.EmailField(
-        label=_("E-mail address"))
+    username = forms.CharField(label=_("Username"))
+    title = forms.CharField(label=_("Custom title"), required=False)
+    email = forms.EmailField(label=_("E-mail address"))
 
     class Meta:
         model = get_user_model()
@@ -60,7 +56,9 @@ class UserBaseForm(forms.ModelForm):
 
 class NewUserForm(UserBaseForm):
     new_password = forms.CharField(
-        label=_("Password"), widget=forms.PasswordInput)
+        label=_("Password"),
+        widget=forms.PasswordInput
+    )
 
     class Meta:
         model = get_user_model()
@@ -71,58 +69,73 @@ class EditUserForm(UserBaseForm):
     new_password = forms.CharField(
         label=_("Change password to"),
         widget=forms.PasswordInput,
-        required=False)
+        required=False
+    )
 
     is_avatar_locked = forms.YesNoSwitch(
         label=_("Lock avatar"),
-        help_text=_("Setting this to yes will stop user from "
-                    "changing his/her avatar, and will reset "
-                    "his/her avatar to procedurally generated one."))
+        help_text=_("Setting this to yes will stop user from changing "
+                    "his/her avatar, and will reset his/her avatar to "
+                    "procedurally generated one.")
+    )
     avatar_lock_user_message = forms.CharField(
         label=_("User message"),
         help_text=_("Optional message for user explaining "
                     "why he/she is banned form changing avatar."),
         widget=forms.Textarea(attrs={'rows': 3}),
-        required=False)
+        required=False
+    )
     avatar_lock_staff_message = forms.CharField(
         label=_("Staff message"),
         help_text=_("Optional message for forum team members explaining "
                     "why user is banned form changing avatar."),
         widget=forms.Textarea(attrs={'rows': 3}),
-        required=False)
+        required=False
+    )
 
     signature = forms.CharField(
         label=_("Signature contents"),
         widget=forms.Textarea(attrs={'rows': 3}),
-        required=False)
+        required=False
+    )
     is_signature_locked = forms.YesNoSwitch(
         label=_("Lock signature"),
         help_text=_("Setting this to yes will stop user from "
-                    "making changes to his/her signature."))
+                    "making changes to his/her signature.")
+    )
     signature_lock_user_message = forms.CharField(
         label=_("User message"),
         help_text=_("Optional message to user explaining "
                     "why his/hers signature is locked."),
         widget=forms.Textarea(attrs={'rows': 3}),
-        required=False)
+        required=False
+    )
     signature_lock_staff_message = forms.CharField(
         label=_("Staff message"),
         help_text=_("Optional message to team members explaining "
                     "why user signature is locked."),
         widget=forms.Textarea(attrs={'rows': 3}),
-        required=False)
+        required=False
+    )
 
     is_hiding_presence = forms.YesNoSwitch(label=_("Hides presence"))
+
     limits_private_thread_invites_to = forms.TypedChoiceField(
         label=_("Who can add user to private threads"),
         coerce=int,
-        choices=PRIVATE_THREAD_INVITES_LIMITS_CHOICES)
+        choices=PRIVATE_THREAD_INVITES_LIMITS_CHOICES
+    )
 
     subscribe_to_started_threads = forms.TypedChoiceField(
-        label=_("Started threads"), coerce=int, choices=AUTO_SUBSCRIBE_CHOICES)
+        label=_("Started threads"),
+        coerce=int,
+        choices=AUTO_SUBSCRIBE_CHOICES
+    )
     subscribe_to_replied_threads = forms.TypedChoiceField(
-        label=_("Replid threads"), coerce=int,
-        choices=AUTO_SUBSCRIBE_CHOICES)
+        label=_("Replid threads"),
+        coerce=int,
+        choices=AUTO_SUBSCRIBE_CHOICES
+    )
 
     class Meta:
         model = get_user_model()
@@ -140,8 +153,7 @@ class EditUserForm(UserBaseForm):
             'signature_lock_user_message',
             'signature_lock_staff_message',
             'subscribe_to_started_threads',
-            'subscribe_to_replied_threads'
-
+            'subscribe_to_replied_threads',
         ]
 
     def clean_signature(self):
@@ -162,20 +174,22 @@ def UserFormFactory(FormType, instance):
 
     extra_fields['rank'] = forms.ModelChoiceField(
         label=_("Rank"),
-        help_text=_("Ranks are used to group and distinguish users. "
-                    "They are also used to add permissions to groups of "
-                    "users."),
+        help_text=_("Ranks are used to group and distinguish users. They are "
+                    "also used to add permissions to groups of users."),
         queryset=Rank.objects.order_by('name'),
-        initial=instance.rank)
+        initial=instance.rank
+    )
 
     roles = Role.objects.order_by('name')
+
     extra_fields['roles'] = forms.ModelMultipleChoiceField(
         label=_("Roles"),
         help_text=_('Individual roles of this user. '
                     'All users must have "member" role.'),
         queryset=roles,
         initial=instance.roles.all() if instance.pk else None,
-        widget=forms.CheckboxSelectMultiple)
+        widget=forms.CheckboxSelectMultiple
+    )
 
     return type('UserFormFinal', (FormType,), extra_fields)
 
@@ -193,12 +207,13 @@ def StaffFlagUserFormFactory(FormType, instance, add_staff_field):
         staff_fields = {
             'staff_level': forms.TypedChoiceField(
                 label=_("Admin level"),
-                help_text=_('Only administrators can access admin sites. '
-                            'In addition to admin site access, superadmins '
-                            'can also change other members admin levels.'),
+                help_text=_("Only administrators can access admin sites. "
+                            "In addition to admin site access, superadmins "
+                            "can also change other members admin levels."),
                 coerce=int,
                 choices=staff_levels,
-                initial=instance.staff_level),
+                initial=instance.staff_level
+            ),
         }
 
         return type('StaffUserForm', (FormType,), staff_fields)
@@ -260,19 +275,22 @@ def SearchUsersForm(*args, **kwargs):
         threadstore.set('misago_admin_roles_choices', roles_choices)
 
     extra_fields = {
-        'rank': forms.TypedChoiceField(label=_("Has rank"),
-                                       coerce=int,
-                                       required=False,
-                                       choices=ranks_choices),
-        'role': forms.TypedChoiceField(label=_("Has role"),
-                                       coerce=int,
-                                       required=False,
-                                       choices=roles_choices)
+        'rank': forms.TypedChoiceField(
+            label=_("Has rank"),
+            coerce=int,
+            required=False,
+            choices=ranks_choices
+        ),
+        'role': forms.TypedChoiceField(
+            label=_("Has role"),
+            coerce=int,
+            required=False,
+            choices=roles_choices
+        )
     }
 
-    FinalForm = type('SearchUsersFormFinal',
-                     (SearchUsersFormBase,),
-                     extra_fields)
+    FinalForm = type(
+        'SearchUsersFormFinal', (SearchUsersFormBase,), extra_fields)
     return FinalForm(*args, **kwargs)
 
 
@@ -284,34 +302,42 @@ class RankForm(forms.ModelForm):
         label=_("Name"),
         validators=[validate_sluggable()],
         help_text=_('Short and descriptive name of all users with this rank. '
-                    '"The Team" or "Game Masters" are good examples.'))
+                    '"The Team" or "Game Masters" are good examples.')
+    )
     title = forms.CharField(
-        label=_("User title"), required=False,
+        label=_("User title"),
+        required=False,
         help_text=_('Optional, singular version of rank name displayed by '
-                    'user names. For example "GM" or "Dev".'))
+                    'user names. For example "GM" or "Dev".')
+    )
     description = forms.CharField(
-        label=_("Description"), max_length=2048, required=False,
+        label=_("Description"),
+        max_length=2048,
+        required=False,
         widget=forms.Textarea(attrs={'rows': 3}),
         help_text=_("Optional description explaining function or status of "
-                    "members distincted with this rank."))
+                    "members distincted with this rank.")
+    )
     roles = forms.ModelMultipleChoiceField(
-        label=_("User roles"), queryset=Role.objects.order_by('name'),
-        required=False,  widget=forms.CheckboxSelectMultiple,
-        help_text=_('Rank can give additional roles to users with it.'))
+        label=_("User roles"),
+        widget=forms.CheckboxSelectMultiple,
+        queryset=Role.objects.order_by('name'),
+        required=False,
+        help_text=_('Rank can give additional roles to users with it.')
+    )
     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 "
-                    "rank owner."))
+                    "rank owner.")
+    )
     is_tab = forms.BooleanField(
-        label=_("Give rank dedicated tab on users list"), required=False,
+        label=_("Give rank dedicated tab on users list"),
+        required=False,
         help_text=_("Selecting this option will make users with this rank "
                     "easily discoverable by others trough dedicated page on "
-                    "forum users list."))
-    is_on_index = forms.BooleanField(
-        label=_("Show users online on forum index"), required=False,
-        help_text=_("Selecting this option will make forum inform other "
-                    "users of their availability by displaying them on forum "
-                    "index page."))
+                    "forum users list.")
+    )
 
     class Meta:
         model = Rank
@@ -322,7 +348,6 @@ class RankForm(forms.ModelForm):
             'title',
             'roles',
             'is_tab',
-            'is_on_index',
         ]
 
     def clean_name(self):
@@ -345,7 +370,8 @@ Bans
 """
 class BanUsersForm(forms.Form):
     ban_type = forms.MultipleChoiceField(
-        label=_("Values to ban"), widget=forms.CheckboxSelectMultiple,
+        label=_("Values to ban"),
+        widget=forms.CheckboxSelectMultiple,
         choices=(
             ('usernames', _('Usernames')),
             ('emails', _('E-mails')),
@@ -353,59 +379,79 @@ class BanUsersForm(forms.Form):
             ('ip', _('IP addresses')),
             ('ip_first', _('First segment of IP addresses')),
             ('ip_two', _('First two segments of IP addresses'))
-        ))
+        )
+    )
     user_message = forms.CharField(
-        label=_("User message"), required=False, max_length=1000,
+        label=_("User message"),
+        required=False,
+        max_length=1000,
         help_text=_("Optional message displayed to users "
                     "instead of default one."),
         widget=forms.Textarea(attrs={'rows': 3}),
         error_messages={
             'max_length': _("Message can't be longer than 1000 characters.")
-        })
+        }
+    )
     staff_message = forms.CharField(
-        label=_("Team message"), required=False, max_length=1000,
+        label=_("Team message"),
+        required=False,
+        max_length=1000,
         help_text=_("Optional ban message for moderators and administrators."),
         widget=forms.Textarea(attrs={'rows': 3}),
         error_messages={
             'max_length': _("Message can't be longer than 1000 characters.")
-        })
+        }
+    )
     expires_on = forms.IsoDateTimeField(
-        label=_("Expires on"), required=False,
-        help_text=_('Leave this field empty for set bans to never expire.'))
+        label=_("Expires on"),
+        required=False,
+        help_text=_('Leave this field empty for set bans to never expire.')
+    )
 
 
 class BanForm(forms.ModelForm):
     check_type = forms.TypedChoiceField(
         label=_("Check type"),
         coerce=int,
-        choices=BANS_CHOICES)
+        choices=BANS_CHOICES
+    )
     banned_value = forms.CharField(
-        label=_("Banned value"), max_length=250,
+        label=_("Banned value"),
+        max_length=250,
         help_text=_('This value is case-insensitive and accepts asterisk (*) '
                     'for rought matches. For example, making IP ban for value '
                     '"83.*" will ban all IP addresses beginning with "83.".'),
         error_messages={
             'max_length': _("Banned value can't be longer "
                             "than 250 characters.")
-        })
+        }
+    )
     user_message = forms.CharField(
-        label=_("User message"), required=False, max_length=1000,
+        label=_("User message"),
+        required=False,
+        max_length=1000,
         help_text=_("Optional message displayed to user "
                     "instead of default one."),
         widget=forms.Textarea(attrs={'rows': 3}),
         error_messages={
             'max_length': _("Message can't be longer than 1000 characters.")
-        })
+        }
+    )
     staff_message = forms.CharField(
-        label=_("Team message"), required=False, max_length=1000,
+        label=_("Team message"),
+        required=False,
+        max_length=1000,
         help_text=_("Optional ban message for moderators and administrators."),
         widget=forms.Textarea(attrs={'rows': 3}),
         error_messages={
             'max_length': _("Message can't be longer than 1000 characters.")
-        })
+        }
+    )
     expires_on = forms.IsoDateTimeField(
-        label=_("Expires on"), required=False,
-        help_text=_('Leave this field empty for this ban to never expire.'))
+        label=_("Expires on"),
+        required=False,
+        help_text=_('Leave this field empty for this ban to never expire.')
+    )
 
     class Meta:
         model = Ban
@@ -438,18 +484,23 @@ SARCH_BANS_CHOICES = (
 
 class SearchBansForm(forms.Form):
     check_type = forms.ChoiceField(
-        label=_("Type"), required=False,
-        choices=SARCH_BANS_CHOICES)
+        label=_("Type"),
+        required=False,
+        choices=SARCH_BANS_CHOICES
+    )
     value = forms.CharField(
         label=_("Banned value begins with"),
-        required=False)
+        required=False
+    )
     state = forms.ChoiceField(
-        label=_("State"), required=False,
+        label=_("State"),
+        required=False,
         choices=(
             ('', _('Any')),
             ('used', _('Active')),
             ('unused', _('Expired')),
-        ))
+        )
+    )
 
     def filter_queryset(self, search_criteria, queryset):
         criteria = search_criteria
@@ -481,16 +532,22 @@ Warning levels
 class WarningLevelForm(forms.ModelForm):
     name = forms.CharField(label=_("Level name"), max_length=255)
     length_in_minutes = forms.IntegerField(
-        label=_("Length in minutes"), min_value=0,
+        label=_("Length in minutes"),
+        min_value=0,
         help_text=_("Enter number of minutes since this warning level was "
                     "imposed on member until it's reduced, or 0 to make "
-                    "this warning level permanent."))
+                    "this warning level permanent.")
+    )
     restricts_posting_replies = forms.TypedChoiceField(
         label=_("Posting replies"),
-        coerce=int, choices=RESTRICTIONS_CHOICES)
+        coerce=int,
+        choices=RESTRICTIONS_CHOICES
+    )
     restricts_posting_threads = forms.TypedChoiceField(
         label=_("Posting threads"),
-        coerce=int, choices=RESTRICTIONS_CHOICES)
+        coerce=int,
+        choices=RESTRICTIONS_CHOICES
+    )
 
     class Meta:
         model = WarningLevel

misago/users/migrations/0001_initial.py

@@ -88,7 +88,6 @@ class Migration(migrations.Migration):
             fields=[
                 ('current_ip', models.GenericIPAddressField()),
                 ('last_click', models.DateTimeField(default=django.utils.timezone.now)),
-                ('is_visible_on_index', models.BooleanField(default=False)),
                 ('user', models.OneToOneField(related_name='online_tracker', primary_key=True, serialize=False, to=settings.AUTH_USER_MODEL)),
             ],
             options={
@@ -122,7 +121,6 @@ class Migration(migrations.Migration):
                 ('css_class', models.CharField(max_length=255, null=True, blank=True)),
                 ('is_default', models.BooleanField(default=False)),
                 ('is_tab', models.BooleanField(default=False)),
-                ('is_on_index', models.BooleanField(default=False)),
                 ('order', models.IntegerField(default=0)),
                 ('roles', models.ManyToManyField(to='misago_acl.Role', null=True, blank=True)),
             ],

misago/users/migrations/0004_default_ranks.py

@@ -16,14 +16,15 @@ def create_default_ranks(apps, schema_editor):
         title=_("Team"),
         css_class='team',
         is_tab=True,
-        is_on_index=True,
-        order=0)
+        order=0
+    )
 
     member = Rank.objects.create(
         name=_("Members"),
         slug=slugify(_("Members")),
         is_default=True,
-        order=1)
+        order=1
+    )
 
     Role = apps.get_model('misago_acl', 'Role')
 

misago/users/models/rank.py

@@ -30,7 +30,6 @@ class Rank(models.Model):
     css_class = models.CharField(max_length=255, null=True, blank=True)
     is_default = models.BooleanField(default=False)
     is_tab = models.BooleanField(default=False)
-    is_on_index = models.BooleanField(default=False)
     order = models.IntegerField(default=0)
 
     objects = RankManager()

misago/users/models/user.py

@@ -423,7 +423,6 @@ class Online(models.Model):
                                 related_name='online_tracker')
     current_ip = models.GenericIPAddressField()
     last_click = models.DateTimeField(default=timezone.now)
-    is_visible_on_index = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
         try:

misago/users/online/tracker.py

@@ -10,7 +10,6 @@ def start_tracking(request, user):
     online_tracker = Online.objects.create(
         user=user,
         current_ip=request.user_ip,
-        is_visible_on_index=user.rank.is_on_index
     )
 
     request.user.online_tracker = online_tracker
@@ -21,14 +20,7 @@ def update_tracker(request, tracker):
     tracker.current_ip = request.user_ip
     tracker.last_click = timezone.now()
 
-    rank_visible_on_index = request.user.rank.is_on_index
-    if tracker.is_visible_on_index != rank_visible_on_index:
-        tracker.is_visible_on_index = rank_visible_on_index
-        tracker.save(update_fields=[
-            'last_click', 'current_ip', 'is_visible_on_index'
-        ])
-    else:
-        tracker.save(update_fields=['last_click', 'current_ip'])
+    tracker.save(update_fields=['last_click', 'current_ip'])
 
 
 def stop_tracking(request, tracker):