ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove load_navigation_env_data 

it doesn't seem to be doing anything

Change-Id: Ie8f0b0e87676669b4df2c14849f1ec9b8a71c8f7
Reviewed-on: https://gerrit.instructure.com/74967
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: James Williams  <jamesw@instructure.com>
QA-Review: James Williams  <jamesw@instructure.com>
This commit is contained in:
James Williams 2016-03-21 08:21:33 -06:00
parent 720f391232
commit 0d37fb1c98
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/helpers/global_navigation_helper.rb
View File

@ -1,17 +1,4 @@
module GlobalNavigationHelper
def load_navigation_env_data
if @current_user
visibility = ContextExternalTool.global_navigation_visibility_for_user(@domain_root_account, @current_user)
tools = ContextExternalTool.global_navigation_tools(@domain_root_account, visibility)
@mapped_tools = tools.map do |tool|
{
tool_data: tool,
link: account_external_tool_path(@domain_root_account, tool, :launch_type => 'global_navigation')
}
end
end
end
# When k12 flag is on, replaces global navigation icon with a different one
def svg_icon(icon)
base = k12? ? 'k12/' : ''

1
app/views/shared/_new_nav_header.html.erb
View File

@ -1,5 +1,4 @@
<% js_bundle :navigation_header %>
<% load_navigation_env_data %>
<header id="header" class="ic-app-header no-print <%= 'no-user' unless @current_user %>">
<div class="ic-app-header__layout">
<div class="ic-app-header__primary">