Code

Ticket #2332: is_loggedin.patch

File is_loggedin.patch, 8.8 KB (added by SmileyChris, 8 years ago)

is_loggedin implementation - also replaces all is_anonymous references with negative is_loggedin

  • django/contrib/admin/templates/admin/base.html

     
    2020        <div id="branding"> 
    2121        {% block branding %}{% endblock %} 
    2222        </div> 
    23         {% if not user.is_anonymous %}{% if user.is_staff %} 
     23        {% if user.is_loggedin %}{% if user.is_staff %} 
    2424        <div id="user-tools">{% trans 'Welcome,' %} <strong>{% if user.first_name %}{{ user.first_name|escape }}{% else %}{{ user.username }}{% endif %}</strong>. {% block userlinks %}<a href="doc/">{% trans 'Documentation' %}</a> / <a href="password_change/">{% trans 'Change password' %}</a> / <a href="logout/">{% trans 'Log out' %}</a>{% endblock %}</div> 
    2525        {% endif %}{% endif %} 
    2626        {% block nav-global %}{% endblock %} 
  • django/contrib/admin/views/decorators.py

     
    4646    member, displaying the login page if necessary. 
    4747    """ 
    4848    def _checklogin(request, *args, **kwargs): 
    49         if not request.user.is_anonymous() and request.user.is_staff: 
     49        if request.user.is_loggedin() and request.user.is_staff: 
    5050            # The user is valid. Continue to the admin page. 
    5151            if request.POST.has_key('post_data'): 
    5252                # User must have re-authenticated through a different window 
  • django/contrib/auth/decorators.py

     
    1717        return _checklogin 
    1818    return _dec 
    1919 
    20 login_required = user_passes_test(lambda u: not u.is_anonymous()) 
     20login_required = user_passes_test(lambda u: u.is_loggedin()) 
    2121login_required.__doc__ = ( 
    2222    """ 
    2323    Decorator for views that checks that the user is logged in, redirecting 
  • django/contrib/auth/models.py

     
    123123        return "/users/%s/" % self.username 
    124124 
    125125    def is_anonymous(self): 
    126         "Always returns False. This is a way of comparing User objects to anonymous users." 
    127         return False 
     126        " Depreciated: use .is_loggedin() instead. " 
     127        return not self.is_loggedin() 
     128         
     129    def is_loggedin(self): 
     130        """ 
     131        Always return True. This is a way of comparing User objects to 
     132        anonymous users. 
     133        """ 
     134        return True 
    128135 
    129136    def get_full_name(self): 
    130137        "Returns the first_name plus the last_name, with a space in between." 
     
    291298    def get_and_delete_messages(self): 
    292299        return [] 
    293300 
    294     def is_anonymous(self): 
    295         return True 
     301    def is_loggedin(self): 
     302        return False 
  • django/contrib/comments/templates/comments/form.html

     
    22{% if display_form %} 
    33<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post"> 
    44 
    5 {% if user.is_anonymous %} 
     5{% if not user.is_loggedin %} 
    66<p><label for="id_username">{% trans "Username:" %}</label> <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p> 
    77{% else %} 
    88<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p> 
  • django/contrib/comments/templatetags/comments.py

     
    114114        comment_list = get_list_function(**kwargs).order_by(self.ordering + 'submit_date').select_related() 
    115115 
    116116        if not self.free: 
    117             if context.has_key('user') and not context['user'].is_anonymous(): 
     117            if context.has_key('user') and context['user'].is_loggedin(): 
    118118                user_id = context['user'].id 
    119119                context['user_can_moderate_comments'] = Comment.objects.user_is_moderator(context['user']) 
    120120            else: 
  • django/contrib/comments/views/comments.py

     
    6363                validator_list=get_validator_list(8), 
    6464            ), 
    6565        ]) 
    66         if not user.is_anonymous(): 
     66        if user.is_loggedin(): 
    6767            self["username"].is_required = False 
    6868            self["username"].validator_list = [] 
    6969            self["password"].is_required = False 
  • django/contrib/comments/views/karma.py

     
    1515    rating = {'up': 1, 'down': -1}.get(vote, False) 
    1616    if not rating: 
    1717        raise Http404, "Invalid vote" 
    18     if request.user.is_anonymous(): 
     18    if not request.user.is_loggedin(): 
    1919        raise Http404, _("Anonymous users cannot vote") 
    2020    try: 
    2121        comment = Comment.objects.get(pk=comment_id) 
  • django/contrib/flatpages/views.py

     
    2222    f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID) 
    2323    # If registration is required for accessing this page, and the user isn't 
    2424    # logged in, redirect to the login page. 
    25     if f.registration_required and request.user.is_anonymous(): 
     25    if f.registration_required and not request.user.is_loggedin(): 
    2626        from django.contrib.auth.views import redirect_to_login 
    2727        return redirect_to_login(request.path) 
    2828    if f.template_name: 
  • django/views/generic/create_update.py

     
    2020            the form wrapper for the object 
    2121    """ 
    2222    if extra_context is None: extra_context = {} 
    23     if login_required and request.user.is_anonymous(): 
     23    if login_required and not request.user.is_loggedin(): 
    2424        return redirect_to_login(request.path) 
    2525 
    2626    manipulator = model.AddManipulator(follow=follow) 
     
    3939            # No errors -- this means we can save the data! 
    4040            new_object = manipulator.save(new_data) 
    4141 
    42             if not request.user.is_anonymous(): 
     42            if request.user.is_loggedin(): 
    4343                request.user.message_set.create(message="The %s was created successfully." % model._meta.verbose_name) 
    4444 
    4545            # Redirect to the new object: first by trying post_save_redirect, 
     
    8686            the original object being edited 
    8787    """ 
    8888    if extra_context is None: extra_context = {} 
    89     if login_required and request.user.is_anonymous(): 
     89    if login_required and not request.user.is_loggedin(): 
    9090        return redirect_to_login(request.path) 
    9191 
    9292    # Look up the object to be edited 
     
    113113        if not errors: 
    114114            object = manipulator.save(new_data) 
    115115 
    116             if not request.user.is_anonymous(): 
     116            if request.user.is_loggedin(): 
    117117                request.user.message_set.create(message="The %s was updated successfully." % model._meta.verbose_name) 
    118118 
    119119            # Do a post-after-redirect so that reload works, etc. 
     
    162162            the original object being deleted 
    163163    """ 
    164164    if extra_context is None: extra_context = {} 
    165     if login_required and request.user.is_anonymous(): 
     165    if login_required and not request.user.is_loggedin(): 
    166166        return redirect_to_login(request.path) 
    167167 
    168168    # Look up the object to be edited 
     
    180180 
    181181    if request.method == 'POST': 
    182182        object.delete() 
    183         if not request.user.is_anonymous(): 
     183        if request.user.is_loggedin(): 
    184184            request.user.message_set.create(message="The %s was deleted." % model._meta.verbose_name) 
    185185        return HttpResponseRedirect(post_delete_redirect) 
    186186    else: