diff --git a/html/admin/sql/patch/upgrade110.sql b/html/admin/sql/patch/upgrade110.sql new file mode 100644 index 000000000..251671dad --- /dev/null +++ b/html/admin/sql/patch/upgrade110.sql @@ -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; diff --git a/html/js/scripts.js b/html/js/scripts.js index f2cf81331..7c70e1942 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -811,7 +811,8 @@ function show_ledger_choice(json_obj) style: ';position:absolute;width:60%;z-index:20;margin-left:20%', drag: 1 }; - var y=calcy(posY); + //var y=calcy(posY); + var y=posY; if (json_obj.div != '')obj.cssclass=""; obj.style="top:"+y+obj.style; add_div(obj); diff --git a/include/ajax_bookmark.php b/include/ajax_bookmark.php index 840d6e80a..d92cf3fb3 100644 --- a/include/ajax_bookmark.php +++ b/include/ajax_bookmark.php @@ -59,7 +59,7 @@ if (isset($_GET['bookmark_delete']) && isset ($_GET['book'])){ $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)); diff --git a/include/class_html_input.php b/include/class_html_input.php index a375f826c..80780db66 100755 --- a/include/class_html_input.php +++ b/include/class_html_input.php @@ -318,6 +318,7 @@ class HtmlInput /* create a hidden div for the ledger */ echo '