Commit fd265d46 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Merge the confAppNode, casNode and schedNode in the single node appNode.

parent 4db21503
......@@ -11,6 +11,27 @@ Panel = dbui.Panel
PanelWithUrlSelector = dbui.to_panelWithUrlSelector
Window = dbui.Window
#-------------------------------------------------------------------------------
#
# APPLICATION NODE
#
#-------------------------------------------------------------------------------
appNode = None
if session.role == ADMIN:
appNode = Node(T('Application'))
appNode.add_child(T('properties'), to_grid('application'))
if "auth" in globals():
appNode.add_child(T('users'), to_grid('auth_user'))
appNode.add_child(T('groups'), to_grid('auth_group'))
appNode.add_child(T('relation user / groups'), to_grid('auth_membership'))
appNode.add_child('run', to_grid('scheduler_run'))
appNode.add_child('task', to_grid('scheduler_task'))
appNode.add_child('worker', to_grid('scheduler_worker'))
#-------------------------------------------------------------------------------
#
# AUTO HARVESTERS NODE
......@@ -60,31 +81,6 @@ if session.role in (ADMIN, USER):
autoHarvNode.add_child(T('reports'), reportLeaf)
#-------------------------------------------------------------------------------
#
# CAS
#
#-------------------------------------------------------------------------------
casNode = None
if "auth" in globals() and session.role == ADMIN:
casNode = Node(T('CAS'))
casNode.add_child(T('users'), to_grid('auth_user'))
casNode.add_child(T('groups'), to_grid('auth_group'))
casNode.add_child(T('relation user / groups'), to_grid('auth_membership'))
#-------------------------------------------------------------------------------
#
# CONFIGURE APPLICATION
#
#-------------------------------------------------------------------------------
confAppNode = None
if session.role == ADMIN:
confAppNode = Node(T('Configure the application'))
confAppNode.add_child(T('properties'), to_grid('application'))
#-------------------------------------------------------------------------------
#
# CONFIGURE HARVESTERS
......@@ -273,19 +269,6 @@ reportNode.add_child(T('lists'), listLeaf)
reportNode.add_child(T('metrics'), metricLeaf)
reportNode.add_child(T('graphs'), graphLeaf)
#-------------------------------------------------------------------------------
#
# SCHEDULER NODE
#
#-------------------------------------------------------------------------------
schedNode = None
if session.role == ADMIN:
schedNode = Node(T('Scheduler'))
schedNode.add_child('run', to_grid('scheduler_run'))
schedNode.add_child('task', to_grid('scheduler_task'))
schedNode.add_child('worker', to_grid('scheduler_worker'))
#-------------------------------------------------------------------------------
#
# WIZARD NODE
......@@ -317,16 +300,14 @@ if session.role in (ADMIN, USER):
#
#-------------------------------------------------------------------------------
nodes = [helpNode,
casNode,
schedNode,
appNode,
autoHarvNode,
wizardNode,
confAppNode,
confHarvesterNode,
confListNode,
confMetricNode,
dataInstituteNode,
dataPublicationeNode,
wizardNode,
harvestNode,
reportNode]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment