Revision bea584e1 snf-astakos-app/astakos/im/views/im.py

b/snf-astakos-app/astakos/im/views/im.py
55 55

  
56 56
from astakos.im import activation_backends
57 57
from astakos.im.models import AstakosUser, ApprovalTerms, EmailChange, \
58
    AstakosUserAuthProvider, PendingThirdPartyUser, Service
58
    AstakosUserAuthProvider, PendingThirdPartyUser, Component
59 59
from astakos.im.util import get_context, prepare_response, get_query, \
60 60
    restrict_next
61 61
from astakos.im.forms import LoginForm, InvitationForm, FeedbackForm, \
......
283 283
    # providers that user can add
284 284
    user_available_providers = request.user.get_available_auth_providers()
285 285

  
286
    extra_context['services'] = Service.catalog().values()
286
    extra_context['services'] = Component.catalog().values()
287 287
    return render_response(template_name,
288 288
                           profile_form=form,
289 289
                           user_providers=user_providers,
......
805 805
@cookie_fix
806 806
@signed_terms_required
807 807
def landing(request):
808
    context = {'services': Service.catalog(orderfor='dashboard')}
808
    context = {'services': Component.catalog(orderfor='dashboard')}
809 809
    return render_response(
810 810
        'im/landing.html',
811 811
        context_instance=get_context(request), **context)
......
908 908
def get_services(request):
909 909
    callback = request.GET.get('callback', None)
910 910
    mimetype = 'application/json'
911
    data = json.dumps(Service.catalog().values())
911
    data = json.dumps(Component.catalog().values())
912 912

  
913 913
    if callback:
914 914
        # Consume session messages. When get_services is loaded from an astakos

Also available in: Unified diff