Download as
Browse Code »

Commit 798b43cabbd5d28ef69248a93b1b17b32373c34d

Authored by Alexandre Barbosa
1 parent 289d7134
Exists in master and in 45 other branches add_sisp_to_chef, add_super_archives_plugin, automates_core_packing, backup_not_prod, changes_in_buttons_on_content_panel, colab_automated_login, colab_spb_plugin_recipe, colab_widgets_settings, disable_email_dev, fix_breadcrumbs_position, fix_categories_software_link, fix_edit_institution, fix_edit_software_with_another_license, fix_get_license_info, fix_gitlab_assets_permission, fix_list_style_inside_article, fix_list_style_on_folder_elements, fix_merge_request_url, fix_models_translations, fix_no_license, fix_software_communities_translations, fix_software_communities_unit_test, fix_style_create_institution_admin_panel, fix_superarchives_imports, fix_sym_links_noosfero, header_fix, lxc_settings, margin_fix, mezuro_cookbook, refactor_download_block, remove_broken_theme, remove_secondary_email_from_user, remove_sisp_buttons, sisp_catalog_header, sisp_dev_master, software_catalog_style_fix, software_communities_html_refactor, software_infos_api, spb_to_rails4, stable-4.1, stable-4.2, theme_header, theme_javascript_refactory, thread_dropdown, update_search_by_categories

Adding links between portals 

Signed-off-by: Alexandre Barbosa <alexandreab@live.com>
Signed-off-by: Lucas Moura <lucas.moura128@gmail.com>
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com>
Showing 2 changed files with 6 additions and 5 deletions   Show diff stats
src/colab-spb-plugin/src/colab_spb/context_processors.py
  Diff comments   View file @798b43c
1 1 from django.conf import settings
2 2  
3 3  
4   -def sisp_url(request):
5   - return {'SISP_URL': getattr(settings, 'SISP_URL', False)}
  4 +def multiportal_url(request):
  5 + return {'SISP_HOST': getattr(settings, 'SISP_HOST', False),
  6 + 'SPB_HOST': getattr(settings, 'SPB_HOST', False),}
... ...
src/colab-spb-theme-plugin/colab_spb_theme/templates/header.html
  Diff comments   View file @798b43c
1   -{% if SISP_URL in request.META.HTTP_HOST|stringformat:"s" %}
2   - {% include 'header_sisp.html' %}
  1 +{% if SISP_HOST in request.META.HTTP_HOST|stringformat:"s" %}
  2 + {% include 'header_sisp.html' with SPB_PORTAL='http://'|add:SPB_HOST %}
3 3 {% else %}
4   - {% include 'header_spb.html' %}
  4 + {% include 'header_spb.html' with SISP_PORTAL='http://'|add:SISP_HOST %}
5 5 {% endif %}
... ...