From ad00e963b1ca79100216d2db9fcdfca0f3e415c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 28 Dec 2010 15:48:52 +0100 Subject: [PATCH] Fixes deletion of an association education / degree. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- core | 2 +- modules/profile.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core b/core index 4f4f166..80c3b57 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 4f4f166c817d12c39fe65aa5ceafc43e580e9fcc +Subproject commit 80c3b5792bea15876ef8f79b8a64421733c1c001 diff --git a/modules/profile.php b/modules/profile.php index a7f4b03..a6fc07f 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -757,10 +757,10 @@ class ProfileModule extends PLModule $table_editor->describe('degree', 'niveau', true); $table_editor->apply($page, $action, $id); } - function handler_admin_education_degree_set(&$page, $action = 'list', $id = null) { + function handler_admin_education_degree_set(&$page, $action = 'list', $id = null, $id2 = null) { $page->setTitle('Administration - Correspondances formations - niveau de formation'); $page->assign('title', 'Gestion des correspondances formations - niveau de formation'); - $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true); + $table_editor = new PLTableEditor('admin/education_degree_set', 'profile_education_degree', 'eduid', true, 'degreeid'); $table_editor->describe('eduid', 'id formation', true); $table_editor->describe('degreeid', 'id niveau', true); @@ -771,7 +771,7 @@ class ProfileModule extends PLModule $table_editor->add_option_table('profile_education_degree_enum','profile_education_degree_enum.id = t.degreeid'); $table_editor->add_option_field('profile_education_degree_enum.degree', 'degree_name', 'niveau'); - $table_editor->apply($page, $action, $id); + $table_editor->apply($page, $action, $id, $id2); } function handler_admin_sections(&$page, $action = 'list', $id = null) { $page->setTitle('Administration - Sections'); -- 2.1.4