Revision 7a231029 core/views.py

b/core/views.py
185 185
        graph_dict['dev'] = i['dev']
186 186
        urls.append(graph_dict)
187 187
    if q_groupby == 'lun':
188
        urls = sorted(urls, key=lambda k: (k['lun'].name.lower()))
189 188
        if q_sortbystd:
190 189
            urls = sorted(urls, key=lambda k: (k['lun'].name.lower(), -k['dev']))
190
        else:
191
            urls = sorted(urls, key=lambda k: (k['lun'].name.lower()))
191 192
    elif q_groupby == 'type':
192
        urls = sorted(urls, key=lambda k: (k['graph'].type.lower()))
193 193
        if q_sortbystd:
194
            urls = sorted(urls, key=lambda k: (k['graph'].name.lower(), -k['dev']))
194
            urls = sorted(urls, key=lambda k: (k['graph'].type.lower(), -k['dev']))
195
        else:
196
            urls = sorted(urls, key=lambda k: (k['graph'].type.lower()))
195 197
    else:
196
        urls = sorted(urls, key=lambda k:  k['graph'].pk)
197 198
        if q_sortbystd:
198 199
            urls = sorted(urls, key=lambda k: (-k['dev']))
200
        else:
201
            urls = sorted(urls, key=lambda k:  k['graph'].pk)
202
        
199 203
    tags.append({'text':'uncategorized', 'id':'uncategorized'})
200 204
    if q_topfive:
201 205
        urls = urls[:5]

Also available in: Unified diff