From d118fc88f309b8d7aa7645886bd6ab46a02f4f03 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 26 Feb 2018 12:30:25 +0100 Subject: [PATCH] Reorder admin object menu --- app/settings.py | 15 +++++++++++---- bin | 2 +- lib/grappelli-safe | 2 +- lib/mezzanine-organization | 2 +- lib/mezzanine-organization-themes | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/app/settings.py b/app/settings.py index a985ef5d..ade129cf 100644 --- a/app/settings.py +++ b/app/settings.py @@ -469,7 +469,9 @@ ADMIN_MENU_ORDER = ( (_('Media Library'), 'fb_browse'), )), (_('Events'), ('mezzanine_agenda.Event', + 'mezzanine_agenda.Season', 'mezzanine_agenda.EventLocation', + 'mezzanine_agenda.EventShop', 'mezzanine_agenda.EventPrice', 'mezzanine_agenda.EventCategory', 'organization-agenda.EventPublicType', @@ -480,11 +482,12 @@ ADMIN_MENU_ORDER = ( 'organization-magazine.Brief',)), (_('Network'), ('organization-network.Organization', 'organization-network.OrganizationLinked', + 'organization-network.OrganizationRole', + 'organization-network.OrganizationType', 'organization-network.Department', 'organization-network.Team', 'organization-network.Person', 'organization-network.Activity', - 'organization-network.OrganizationType', 'organization-network.PersonListBlock', )), (_('Activity'), ('organization-network.PersonActivity', @@ -493,6 +496,7 @@ ADMIN_MENU_ORDER = ( 'organization-network.ActivityGrade', 'organization-network.ActivityFramework', 'organization-network.ActivityFunction', + 'organization-network.ProjectActivity', 'organization-network.TrainingType', 'organization-network.TrainingTopic', 'organization-network.TrainingLevel', @@ -503,14 +507,17 @@ ADMIN_MENU_ORDER = ( )), (_('Projects'), ('organization-projects.Project', 'organization-projects.ProjectCall', + 'organization-projects.ProjectContact', 'organization-projects.ProjectProgram', 'organization-projects.ProjectProgramType', 'organization-projects.ProjectTopic', - 'organization-projects.ProjectProgramType', - 'organization-projects.ProjectDemo', + 'organization-projects.ProjectWorkPackage', + 'organization-projects.ProjectPublicData', + 'organization-projects.ProjectPrivateData', + 'organization-projects.ProjectResidency', 'organization-projects.Repository', 'organization-projects.RepositorySystem', - 'organization-projects.ProjectWorkPackage' + 'organization-projects.ProjectDemo', )), (_('Shop'), ('shop.Product', 'organization-shop.ProductList', diff --git a/bin b/bin index f7c45631..943219bb 160000 --- a/bin +++ b/bin @@ -1 +1 @@ -Subproject commit f7c456316eb03476bdf4aae2abfcf0f974a49ed3 +Subproject commit 943219bb8232218d393d97982dc25ca67b463827 diff --git a/lib/grappelli-safe b/lib/grappelli-safe index 78bbc0d8..85ea400a 160000 --- a/lib/grappelli-safe +++ b/lib/grappelli-safe @@ -1 +1 @@ -Subproject commit 78bbc0d8d62ec6c99da7a21624595b9af6a582ed +Subproject commit 85ea400a2ccf3be06fb59e5673c205d8ba7abd8c diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization index c161c0d8..9d3c2da2 160000 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@ -1 +1 @@ -Subproject commit c161c0d8f701d40e77119bf37c3e2812b6ba8438 +Subproject commit 9d3c2da26aeabe8bf910e4288ee2440038961b4d diff --git a/lib/mezzanine-organization-themes b/lib/mezzanine-organization-themes index ca9b0d26..6bc3fbf1 160000 --- a/lib/mezzanine-organization-themes +++ b/lib/mezzanine-organization-themes @@ -1 +1 @@ -Subproject commit ca9b0d26084fa5257b4296030ef695cbf8e6c53f +Subproject commit 6bc3fbf1c16104f09ef4bcae9800132776fcde72 -- 2.39.5