Download as
Browse Code »

Commit 31c12deeed7cebe905bb92aa2c76a1bfa11f220f

Authored by Sergio Oliveira
1 parent 34850b9a
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

New Noosfero profile redirect

Showing 2 changed files with 3 additions and 14 deletions   Show diff stats
colab/proxy/noosfero/apps.py
  Diff comments   View file @31c12de
... ... @@ -15,9 +15,7 @@ class ProxyNoosferoAppConfig(ColabProxiedAppConfig):
15 15 (_('Communities'), 'search/communities'),
16 16 ),
17 17 'auth_links': (
18   - (_('Profile'), 'profile/{0}'),
19   - (_('Control panel'), 'myprofile/{0}'),
  18 + (_('Profile'), 'profile/~/'),
  19 + (_('Control panel'), 'myprofile/~/'),
20 20 ),
21 21 }
22   -
23   - arguments = ["context['user']"]
... ...
colab/proxy/templatetags/proxy.py
  Diff comments   View file @31c12de
... ... @@ -37,17 +37,8 @@ def proxy_menu(context):
37 37 if title not in menu_links:
38 38 menu_links[title] = []
39 39  
40   - is_authenticated = context['request'].user.is_authenticated()
41   - if hasattr(app, 'arguments') and is_authenticated:
42   - arguments = app.arguments
43   - else:
44   - arguments = []
45   -
46   - for i, _ in enumerate(arguments):
47   - arguments[i] = eval(arguments[i])
48   -
49 40 for text, link in links:
50   - url = reverse(app.label, args=(link.format(*arguments),))
  41 + url = reverse(app.label, args=(link,))
51 42 menu_links[title].append((text, url))
52 43  
53 44 menu = render_to_string('proxy/menu_template.html',
... ...