Revision 7f1f9f3b edumanage/views.py

b/edumanage/views.py
6 6
import datetime
7 7
from xml.etree import ElementTree
8 8

  
9
from django.shortcuts import render_to_response, redirect
9
from django.shortcuts import render_to_response, redirect, render
10 10
from django.http import HttpResponse, HttpResponseRedirect, HttpResponseNotFound
11 11
from django.template import RequestContext
12 12
from django.core.urlresolvers import reverse
......
62 62

  
63 63
@never_cache
64 64
def index(request):
65
    return render_to_response(
65
    return render(
66
        request,
66 67
        'front/index.html',
67
        context_instance=RequestContext(request)
68 68
    )
69 69

  
70 70

  
......
79 79
            context_instance=RequestContext(request, base_response(request))
80 80
        )
81 81
    except AttributeError:
82
        return render_to_response(
82
        return render(
83
            request,
83 84
            'edumanage/welcome_manage.html',
84
            context_instance=RequestContext(request, base_response(request))
85
            {}
85 86
        )
86 87
    if user.is_authenticated() and user.is_active and profile.is_social_active:
87 88
        return redirect(reverse('manage'))
88 89
    else:
89
        return render_to_response(
90
        return render(
91
            request,
90 92
            'edumanage/welcome_manage.html',
91
            context_instance=RequestContext(request, base_response(request))
93
            {}
92 94
        )
93 95

  
94 96

  
......
1454 1456
            else:
1455 1457
                response_location['enc'] = u"-"
1456 1458
            response_location['AP_no'] = u"%s" % (sl.AP_no)
1457
            response_location['name'] = sl.loc_name.get(lang='en').name
1459
            try:
1460
                response_location['name'] = sl.loc_name.get(lang='en').name
1461
            except Name_i18n.DoesNotExist:
1462
                response_location['name'] = 'unknown'
1458 1463
            response_location['port_restrict'] = u"%s" % (sl.port_restrict)
1459 1464
            response_location['transp_proxy'] = u"%s" % (sl.transp_proxy)
1460 1465
            response_location['IPv6'] = u"%s" % (sl.IPv6)
......
1514 1519
                lang=lang
1515 1520
            ).name
1516 1521
        except Name_i18n.DoesNotExist:
1517
            response_location['inst'] = sl.institutionid.org_name.get(
1518
                lang='en'
1519
            ).name
1520
        try:
1521
            response_location['name'] = sl.loc_name.get(lang=lang).name
1522
        except Name_i18n.DoesNotExist:
1523
            response_location['name'] = sl.loc_name.get(lang='en').name
1522
            try:
1523
                response_location['name'] = sl.loc_name.get(lang='en').name
1524
            except Name_i18n.DoesNotExist:
1525
                response_location['name'] = 'unknown'
1524 1526
        response_location['port_restrict'] = u"%s" % (sl.port_restrict)
1525 1527
        response_location['transp_proxy'] = u"%s" % (sl.transp_proxy)
1526 1528
        response_location['IPv6'] = u"%s" % (sl.IPv6)

Also available in: Unified diff