Item class has been moved to a new directory 'models', a new class has been added: ItemContent

and same fields from Item were moved to ItemContent

Item
- id
- parent_id
- type (file, dir, symlink)
- url
- subject
- template (html template)
- sort_index
- content_id

ItemContent
- id
- ref -> references (renamed)
- user_id
- modification_user_id
- group_id
- privileges
- date_creation
- date_modification
- guest_name
- link_to
- link_redirect
- file_path
- file_fs
- file_type
- file_size
- has_thumb -> file_has_thumb (renamed)
- hash -> file_hash (renamed)
- hash_type -> file_hash_type (renamed)
- content -> content_raw (renamed)
- content_type -> content_raw_type (renamed)
- content_parsed
- content_parsed_type
- meta
- ameta -> meta_admin (renamed)
- modify_index (removed)

WIP: #4
This commit is contained in:
2021-02-24 01:19:47 +01:00
parent 3d7ece15f8
commit 32e93a04c5
118 changed files with 5795 additions and 4514 deletions

View File

@@ -5,7 +5,7 @@
*/
/*
* Copyright (c) 2008-2018, Tomasz Sowa
* Copyright (c) 2008-2021, Tomasz Sowa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -307,12 +307,12 @@ void ticket_is_creating_new(Info & i)
void ticket_meta_value(Info & i)
{
if( ticket_info.item )
space_value(i, ticket_info.item->meta);
space_value(i, ticket_info.item->item_content.meta);
}
void ticket_is_closed(Info & i)
{
PT::Space * ticket_space = ticket_info.item->ameta.FindSpace(L"ticket");
PT::Space * ticket_space = ticket_info.item->item_content.meta_admin.FindSpace(L"ticket");
if( ticket_space )
i.res = ticket_space->Bool(L"closed", false);
@@ -343,7 +343,7 @@ void ticket_param_value_for_param_id(Info & i)
if( ticket_info.ticket && ticket_info.item )
{
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->meta);
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta);
ticket_print_value(i, value_for_param_id);
}
@@ -378,7 +378,7 @@ void ticket_does_param_id_have_value(Info & i)
if( ticket_info.ticket && ticket_info.item )
{
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->meta);
find_ticket_value(value_for_param_id, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta);
if( value_for_param_id.is_value )
{
@@ -545,7 +545,7 @@ void tickets_tab_is_closed(Info & i)
if( tickets_value.is_item )
{
PT::Space * ticket_space = tickets_value.item->ameta.FindSpace(L"ticket");
PT::Space * ticket_space = tickets_value.item->item_content.meta_admin.FindSpace(L"ticket");
if( ticket_space )
i.res = ticket_space->Bool(L"closed", false);
@@ -587,7 +587,7 @@ void tickets_tab_meta_value(Info & i)
tickets_tab_check_reqid();
if( tickets_value.is_item )
space_value(i, tickets_value.item->meta);
space_value(i, tickets_value.item->item_content.meta);
}
@@ -599,7 +599,7 @@ void tickets_tab_date_creation(Info & i)
tickets_tab_check_reqid();
if( tickets_value.is_item )
i.out << tickets_value.item->date_creation;
i.out << tickets_value.item->item_content.date_creation;
}
@@ -609,7 +609,7 @@ void tickets_tab_date_creation_nice(Info & i)
tickets_tab_check_reqid();
if( tickets_value.is_item )
print_date_nice(i, tickets_value.item->date_creation);
print_date_nice(i, tickets_value.item->item_content.date_creation);
}
@@ -637,7 +637,7 @@ void tickets_tab_param_value_for_param_id(Info & i)
value_for_param_id.config_par = space.spaces[param_index];
value_for_param_id.param_id = value_for_param_id.config_par->Long(L"id");
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->meta);
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta);
ticket_print_value(i, value_for_param_id);
break;
@@ -670,7 +670,7 @@ void tickets_tab_does_param_id_have_value(Info & i)
value_for_param_id.config_par = space.spaces[param_index];
value_for_param_id.param_id = value_for_param_id.config_par->Long(L"id");
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->meta);
find_ticket_value(value_for_param_id, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta);
if( value_for_param_id.is_value )
{
@@ -712,7 +712,7 @@ void tickets_tab_conf_tab(Info & i)
value.is_param = true;
value.config_par = space.spaces[conf_index];
value.param_id = value.config_par->Long(L"id");
find_ticket_value(value, tickets_value.ticket->par_tab, tickets_value.item->meta);
find_ticket_value(value, tickets_value.ticket->par_tab, tickets_value.item->item_content.meta);
}
}
}
@@ -925,7 +925,7 @@ void ticket_tab(Info & i)
value.param_id = value.config_par->Long(L"id");
if( ticket_info.ticket && ticket_info.item )
find_ticket_value(value, ticket_info.ticket->par_tab, ticket_info.item->meta);
find_ticket_value(value, ticket_info.ticket->par_tab, ticket_info.item->item_content.meta);
}
}