Removed activation requirement after email/password change.

misago/users/forms.py

@@ -187,7 +187,7 @@ class NewUserForm(Form):
 class SearchUsersForm(Form):
     username = forms.CharField(max_length=255, required=False)
     email = forms.CharField(max_length=255, required=False)
-    activation = forms.MultipleChoiceField(widget=forms.CheckboxSelectMultiple, choices=(('0', _("Already Active")), ('1', _("By User")), ('2', _("By Administrator")), ('3', _("Sign-In Credentials Change"))), required=False)
+    activation = forms.MultipleChoiceField(widget=forms.CheckboxSelectMultiple, choices=(('0', _("Already Active")), ('1', _("By User")), ('2', _("By Administrator"))), required=False)
     rank = forms.ModelMultipleChoiceField(widget=forms.CheckboxSelectMultiple, queryset=Rank.objects.order_by('order').all(), required=False)
     role = forms.ModelMultipleChoiceField(widget=forms.CheckboxSelectMultiple, queryset=Role.objects.order_by('name').all(), required=False)
     

templates/admin/users/list.html

@@ -28,10 +28,8 @@
   <td colspan="2" class="lead-cell">
   	<strong>{{ item.username }}</strong> <span class="muted">{{ item.email }}</span>{% if item.activation > 0 %} <span class="label tooltip-top" title="{% if item.activation == 1 -%}
   	{% trans %}This user has not yet validated his e-mail address.{% endtrans %}
-  	{%- elif item.activation == 2 -%}
-  	{% trans %}This user is awaiting admin approval.{% endtrans %}
   	{%- else -%}
-  	{% trans %}This user is changing his sign-in credentials.{% endtrans %}
+  	{% trans %}This user is awaiting admin approval.{% endtrans %}
   	{%- endif %}">{% trans %}Inactive{% endtrans %}</span>{% endif %}
   </td>
 {% endblock%}