Download as
Browse Code »

Commit 34850b9a29a72bd3b8a47bec70daa3bdf3c509ae

Authored by carol15022
1 parent a621653f
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

Add dynamic links 

Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
Signed-off-by: Macartur Souza <macartur.sc@gmail.com>
Showing 2 changed files with 14 additions and 3 deletions   Show diff stats
colab/proxy/noosfero/apps.py
  Diff comments   View file @34850b9
@@ -15,7 +15,9 @@ class ProxyNoosferoAppConfig(ColabProxiedAppConfig): @@ -15,7 +15,9 @@ class ProxyNoosferoAppConfig(ColabProxiedAppConfig):
15 (_('Communities'), 'search/communities'), 15 (_('Communities'), 'search/communities'),
16 ), 16 ),
17 'auth_links': ( 17 'auth_links': (
18 - (_('Profile'), 'profile'),  
19 - (_('Control panel'), 'myprofile'), 18 + (_('Profile'), 'profile/{0}'),
  19 + (_('Control panel'), 'myprofile/{0}'),
20 ), 20 ),
21 } 21 }
  22 +
  23 + arguments = ["context['user']"]
colab/proxy/templatetags/proxy.py
  Diff comments   View file @34850b9
@@ -37,8 +37,17 @@ def proxy_menu(context): @@ -37,8 +37,17 @@ def proxy_menu(context):
37 if title not in menu_links: 37 if title not in menu_links:
38 menu_links[title] = [] 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 +
40 for text, link in links: 49 for text, link in links:
41 - url = reverse(app.label, args=(link,)) 50 + url = reverse(app.label, args=(link.format(*arguments),))
42 menu_links[title].append((text, url)) 51 menu_links[title].append((text, url))
43 52
44 menu = render_to_string('proxy/menu_template.html', 53 menu = render_to_string('proxy/menu_template.html',