diff --git a/apex/f770/application/pages/page_00910.sql b/apex/f770/application/pages/page_00910.sql index d20e44e..545d6da 100644 --- a/apex/f770/application/pages/page_00910.sql +++ b/apex/f770/application/pages/page_00910.sql @@ -22,7 +22,7 @@ wwv_flow_api.create_page( ,p_page_template_options=>'#DEFAULT#' ,p_required_role=>wwv_flow_api.id(9556407311505078) ,p_last_updated_by=>'DEV' -,p_last_upd_yyyymmddhh24miss=>'20220102135221' +,p_last_upd_yyyymmddhh24miss=>'20220105205554' ); wwv_flow_api.create_page_plug( p_id=>wwv_flow_api.id(9192009232668637) @@ -534,9 +534,6 @@ wwv_flow_api.create_region_column( ,p_is_primary_key=>false ,p_duplicate_value=>true ,p_include_in_export=>true -,p_display_condition_type=>'EXPRESSION' -,p_display_condition=>'app.get_app_id() = app.get_core_app_id()' -,p_display_condition2=>'PLSQL' ,p_security_scheme=>wwv_flow_api.id(9556407311505078) ); wwv_flow_api.create_interactive_grid( diff --git a/tables/navigation.sql b/tables/navigation.sql index d27406c..1e0e04a 100644 --- a/tables/navigation.sql +++ b/tables/navigation.sql @@ -30,7 +30,7 @@ CREATE TABLE navigation ( CHECK (is_reset = 'Y' OR is_reset IS NULL), -- CONSTRAINT ch_navigation_is_shared - CHECK ((is_shared = 'Y' AND app_id = 770) OR is_shared IS NULL) -- CORE app_id + CHECK (is_shared = 'Y' OR is_shared IS NULL) ) STORAGE (BUFFER_POOL KEEP); -- diff --git a/views/nav_overview.sql b/views/nav_overview.sql index 9b04f24..4be5b8b 100644 --- a/views/nav_overview.sql +++ b/views/nav_overview.sql @@ -30,7 +30,6 @@ t AS ( AND p.page_id = n.page_id LEFT JOIN apex_applications a ON a.application_id = p.application_id - WHERE n.app_id IN (x.app_id, x.core_app_id) CONNECT BY n.parent_id = PRIOR n.page_id AND n.app_id = PRIOR n.app_id START WITH n.parent_id IS NULL @@ -98,10 +97,9 @@ WHERE (x.filter_page_id = n.page_id OR x.filter_page_id IS NULL) AND ( n.app_id = x.app_id OR ( - n.app_id = x.core_app_id - AND n.is_shared = 'Y' + n.is_shared = 'Y' AND n.page_id NOT IN ( - -- if page from CORE has same page number in current app, then skip it + -- pages from active apps takes priority SELECT n.page_id FROM navigation n WHERE n.app_id = x.app_id