[Phpcompta-dev] r5577 - in phpcompta/tags/rel670: html/admin/sql/patch include

[phpcompta-dev]

Author: danydb
Date: 2013-12-06 17:19:32 +0100 (Fri, 06 Dec 2013)
New Revision: 5577

Added:
   phpcompta/tags/rel670/html/admin/sql/patch/upgrade110.sql
Modified:
   phpcompta/tags/rel670/include/ajax_bookmark.php
   phpcompta/tags/rel670/include/constant.php
Log:
bug #931 - Parfois on ne peut pas ajouter le favori
Ajout vue v_menu_description_favori
Task #931 - Parfois on ne peut pas ajouter le favori

Added: phpcompta/tags/rel670/html/admin/sql/patch/upgrade110.sql
===================================================================
--- phpcompta/tags/rel670/html/admin/sql/patch/upgrade110.sql                   
        (rev 0)
+++ phpcompta/tags/rel670/html/admin/sql/patch/upgrade110.sql   2013-12-06 
16:19:32 UTC (rev 5577)
@@ -0,0 +1,26 @@
+begin;
+create or replace view v_menu_description_favori as
+ WITH t_menu AS (
+         SELECT mr.me_menu, pm.me_code, pm.me_code_dep, pm.p_type_display, 
pu.user_name, mr.me_file, mr.me_javascript, mr.me_description, 
mr.me_description_etendue
+           FROM profile_menu pm
+      JOIN profile_user pu ON pu.p_id = pm.p_id
+   JOIN profile p ON p.p_id = pm.p_id
+   JOIN menu_ref mr USING (me_code)
+        )
+ SELECT DISTINCT (COALESCE(v3.me_code || '/'::text, ''::text) || 
COALESCE(v2.me_code, ''::text)) || 
+        CASE
+            WHEN v2.me_code IS NULL THEN COALESCE(v1.me_code, ''::text)
+            WHEN v2.me_code IS NOT NULL THEN COALESCE('/'::text || v1.me_code, 
''::text)
+            ELSE NULL::text
+        END AS code, v1.me_code, v1.me_description, v1.me_description_etendue, 
v1.me_file, v1.user_name, '> '::text || v1.me_menu AS v1menu, 
+        CASE
+            WHEN COALESCE(v3.me_menu, ''::text) <> ''::text THEN ' > '::text 
|| v2.me_menu
+            ELSE v2.me_menu
+        END AS v2menu, v3.me_menu AS v3menu, v3.p_type_display, 
COALESCE(v1.me_javascript, COALESCE(v2.me_javascript, v3.me_javascript)) AS 
javascript
+   FROM t_menu v1
+   LEFT JOIN t_menu v2 ON v1.me_code_dep = v2.me_code
+   LEFT JOIN t_menu v3 ON v2.me_code_dep = v3.me_code
+  WHERE v1.p_type_display <> 'P'::text;
+update version set val=111;
+
+commit;

Modified: phpcompta/tags/rel670/include/ajax_bookmark.php
===================================================================
--- phpcompta/tags/rel670/include/ajax_bookmark.php     2013-12-06 14:41:27 UTC 
(rev 5576)
+++ phpcompta/tags/rel670/include/ajax_bookmark.php     2013-12-06 16:19:32 UTC 
(rev 5577)
@@ -59,7 +59,7 @@
 
 $bookmark_sql="select distinct b_id,b_action,b_order,me_description, 
javascript"
         . " from bookmark "
-        . "join v_menu_description on (code=b_action)"
+        . "join v_menu_description_favori on (code=b_action)"
         . "where "
         . "login=$1 order by b_order,b_action";
 $a_bookmark=$cn->get_array($bookmark_sql,array($g_user->login));

Modified: phpcompta/tags/rel670/include/constant.php
===================================================================
--- phpcompta/tags/rel670/include/constant.php  2013-12-06 14:41:27 UTC (rev 
5576)
+++ phpcompta/tags/rel670/include/constant.php  2013-12-06 16:19:32 UTC (rev 
5577)
@@ -71,7 +71,7 @@
 define 
("SITE_UPDATE_PLUGIN",'http://www.phpcompta.eu/plugin_last_version.txt');
 
 
-define ("DBVERSION",110);
+define ("DBVERSION",111);
 define ("MONO_DATABASE",25);
 define ("DBVERSIONREPO",14);
 define ('NOTFOUND','--not found--');



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu