admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 5577-5581 via svnmerge from

Browse source 
svn+ssh://danydb@ns352270.ovh.net/svn/phpcompta/tags/rel670

........
  r5577 | danydb | 2013-12-06 17:19:32 +0100 (ven., 06 déc. 2013) | 3 lines
  
  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
........
  r5578 | danydb | 2013-12-06 17:30:55 +0100 (ven., 06 déc. 2013) | 4 lines
  
  bug #928 - Fenêtre Journaux dans fenêtre recherche est clippé 
  
  ajout d'un bouton "Fermer"
  Task #928 - Fenêtre Journaux dans fenêtre recherche est clippé
........
  r5579 | danydb | 2013-12-07 20:16:46 +0100 (sam., 07 déc. 2013) | 4 lines
  
  bug #928 - Fenêtre Journaux dans fenêtre recherche est clippé 
  
  Cosmétique
  Task #928 - Fenêtre Journaux dans fenêtre recherche est clippé
........
  r5580 | danydb | 2013-12-07 21:27:36 +0100 (sam., 07 déc. 2013) | 1 line
  
  Cosmétique
........
  r5581 | danydb | 2013-12-07 23:07:15 +0100 (sam., 07 déc. 2013) | 1 line
  
  Fix some cosmetic bug, works with IE11
........
This commit is contained in:
Dany De Bontridder 2013-12-08 11:10:44 +00:00
parent 1c69f7cf75
commit cc26e7f396
8 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
html/admin/sql/patch/upgrade110.sql Normal file
View file

@ -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;