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

b/snf-astakos-app/astakos/im/views.py
79 79
from astakos.im.models import (
80 80
    AstakosUser, ApprovalTerms,
81 81
    EmailChange, AstakosUserAuthProvider, PendingThirdPartyUser,
82
    ProjectApplication, ProjectMembership, Project, Service)
82
    ProjectApplication, ProjectMembership, Project, Service, Resource)
83 83
from astakos.im.util import (
84
    get_context, prepare_response, get_query, restrict_next)
84
    get_context, prepare_response, get_query, restrict_next, model_to_dict)
85 85
from astakos.im.forms import (
86 86
    LoginForm, InvitationForm,
87 87
    FeedbackForm, SignApprovalTermsForm,
......
111 111
    MODERATION_ENABLED)
112 112
from astakos.im import presentation
113 113
from astakos.im import settings as astakos_settings
114
from astakos.im.api.callpoint import AstakosCallpoint
115 114
from astakos.im import auth_providers as auth
116 115
from snf_django.lib.db.transaction import commit_on_success_strict
117 116
from astakos.im.ctx import ExceptionHandler
......
119 118

  
120 119
logger = logging.getLogger(__name__)
121 120

  
122
callpoint = AstakosCallpoint()
123 121

  
124 122
def render_response(template, tab=None, status=200, context_instance=None, **kwargs):
125 123
    """
......
1037 1035
    resource_keys = []
1038 1036

  
1039 1037
    # resources in database
1040
    result = callpoint.list_resources()
1041
    if not result.is_success:
1042
        return False, result
1043
    else:
1044
        # initialize resource_catalog to contain all group/resource information
1045
        for r in result.data:
1046
            if not r.get('group') in resource_groups:
1047
                resource_groups[r.get('group')] = {'icon': 'unknown'}
1048

  
1049
        resource_keys = [r.get('str_repr') for r in result.data]
1050
        resource_catalog = [[g, filter(lambda r: r.get('group', '') == g,
1051
                                       result.data)] for g in resource_groups]
1038
    resource_details = map(lambda obj: model_to_dict(obj, exclude=[]),
1039
                           Resource.objects.all())
1040
    # initialize resource_catalog to contain all group/resource information
1041
    for r in resource_details:
1042
        if not r.get('group') in resource_groups:
1043
            resource_groups[r.get('group')] = {'icon': 'unknown'}
1044

  
1045
    resource_keys = [r.get('str_repr') for r in resource_details]
1046
    resource_catalog = [[g, filter(lambda r: r.get('group', '') == g,
1047
                                   resource_details)] for g in resource_groups]
1052 1048

  
1053 1049
    # order groups, also include unknown groups
1054 1050
    groups_order = resources_meta.get('groups_order')

Also available in: Unified diff