Redmine 4.1.1

This commit is contained in:
Manuel Cillero 2020-11-22 21:20:06 +01:00
parent 33e7b881a5
commit 3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions

View file

@ -1,5 +1,7 @@
# frozen_string_literal: true
# Redmine - project management software
# Copyright (C) 2006-2017 Jean-Philippe Lang
# Copyright (C) 2006-2019 Jean-Philippe Lang
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@ -17,7 +19,8 @@
module Redmine
module MenuManager
class MenuError < StandardError #:nodoc:
# @private
class MenuError < StandardError
end
module MenuController
@ -121,7 +124,7 @@ module Redmine
else
caption, url, selected = extract_node_details(node, project)
return content_tag('li',
render_single_menu_node(node, caption, url, selected))
render_single_menu_node(node, caption, url, selected))
end
end
@ -204,18 +207,19 @@ module Redmine
def extract_node_details(node, project=nil)
item = node
url = case item.url
when Hash
project.nil? ? item.url : {item.param => project}.merge(item.url)
when Symbol
if project
send(item.url, project)
url =
case item.url
when Hash
project.nil? ? item.url : {item.param => project}.merge(item.url)
when Symbol
if project
send(item.url, project)
else
send(item.url)
end
else
send(item.url)
item.url
end
else
item.url
end
caption = item.caption(project)
return [caption, url, (current_menu_item == item.name)]
end