From: Stéphane Jacob <sj@m4x.org>
Date: Tue, 28 Dec 2010 14:48:52 +0000 (+0100)
Subject: Fixes deletion of an association education / degree.
X-Git-Tag: xorg/1.0.2~55
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ad00e963b1ca79100216d2db9fcdfca0f3e415c4;p=platal.git

Fixes deletion of an association education / degree.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

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');