backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed handling of block and optional block.

Browse Source 
- All blocks behavior can be specified and overwritten via the configuaration.
  - And optional block are not displayed by default.
This commit is contained in:
Jocelyn FIAT
2015-10-16 23:46:18 +02:00
parent d2d86ecdf2
commit 23c395513b
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/hooks/cms_hook_core_manager.e
View File

@@ -140,7 +140,6 @@ feature -- Hook: block
local local
bl, l_alias: READABLE_STRING_8 bl, l_alias: READABLE_STRING_8
bl_optional: BOOLEAN bl_optional: BOOLEAN
l_ok: BOOLEAN
l_block_cache: detachable TUPLE [block: CMS_CACHE_BLOCK; region: READABLE_STRING_8; expired: BOOLEAN] l_block_cache: detachable TUPLE [block: CMS_CACHE_BLOCK; region: READABLE_STRING_8; expired: BOOLEAN]
l_alias_table: detachable STRING_TABLE [LIST [READABLE_STRING_8]] --| block_id => [alias_ids..] l_alias_table: detachable STRING_TABLE [LIST [READABLE_STRING_8]] --| block_id => [alias_ids..]
l_origin_block: detachable CMS_BLOCK l_origin_block: detachable CMS_BLOCK
@@ -155,19 +154,13 @@ feature -- Hook: block
across across
h.block_list as blst h.block_list as blst
loop loop
l_ok := False
bl := blst.item bl := blst.item
bl_optional := bl.count > 0 and bl[1] = '?' bl_optional := bl.count > 0 and bl[1] = '?'
if bl_optional then if bl_optional then
bl := bl.substring (2, bl.count) bl := bl.substring (2, bl.count)
if a_response.is_block_included (bl, False) then
l_ok := True
end
else
l_ok := True
end end
if l_ok then if a_response.is_block_included (bl, not bl_optional) then
l_block_cache := a_response.block_cache (bl) l_block_cache := a_response.block_cache (bl)
if l_block_cache /= Void and then not l_block_cache.expired then if l_block_cache /= Void and then not l_block_cache.expired then
a_response.add_block (l_block_cache.block, l_block_cache.region) a_response.add_block (l_block_cache.block, l_block_cache.region)