Projet

Général

Profil

0001-remove-use-of-context_instance-25531.patch

Emmanuel Cazenave, 02 août 2018 19:03

Télécharger (2,38 ko)

Voir les différences:

Subject: [PATCH] remove use of context_instance (#25531)

 src/authentic2_auth_fedict/auth_frontends.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
src/authentic2_auth_fedict/auth_frontends.py
15 15
# along with this program.  If not, see <http://www.gnu.org/licenses/>.
16 16

  
17 17
from django.template.loader import render_to_string
18
from django.template import RequestContext
19 18
from django.shortcuts import render
20 19
from django.utils.translation import ugettext_lazy as _
21 20

  
......
36 35
        return _('Belgian eID')
37 36

  
38 37
    def login(self, request, *args, **kwargs):
39
        context_instance = kwargs.pop('context_instance', None) or RequestContext(request)
38
        context = kwargs.get('context', {})
40 39
        submit_name = 'login-%s' % self.id
41 40
        if request.method == 'POST' and submit_name in request.POST:
42 41
            return redirect_to_login(request, login_url='fedict-login')
42
        context['submit_name'] = submit_name
43 43
        return render(request, 'authentic2_auth_fedict/login.html', {'submit_name': submit_name},
44
                      context_instance=context_instance)
44
                      context)
45 45

  
46 46
    def profile(self, request, *args, **kwargs):
47
        context_instance = kwargs.pop('context_instance', None) or RequestContext(request)
47
        context = kwargs.get('context', {})
48 48
        user_saml_identifiers = request.user.saml_identifiers.all()
49 49
        if not user_saml_identifiers:
50 50
            return ''
51 51
        for user_saml_identifier in user_saml_identifiers:
52 52
            user_saml_identifier.idp = get_idp(user_saml_identifier.issuer)
53
        return render_to_string('authentic2_auth_fedict/profile.html',
54
                                {'user_saml_identifiers': user_saml_identifiers},
55
                                context_instance=context_instance)
53
        context['user_saml_identifiers'] = user_saml_identifiers
54
        return render_to_string('authentic2_auth_fedict/profile.html', context,
55
                                request=request)
56
-