Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into contao413
Browse files Browse the repository at this point in the history
  • Loading branch information
@hschottm
hschottm committed Apr 13, 2023
2 parents 1121e89 + 9fde5ad commit 33a04fa
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 9 deletions.
4 changes: 3 additions & 1 deletion dca/tl_calendar_events.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ public function onCopy($insertID, \DataContainer $dc)
{
$GLOBALS['TL_DCA']['tl_calendar_events']['config']['ondelete_callback'][] = array('tl_calendar_events_tags', 'deleteEvents');
$GLOBALS['TL_DCA']['tl_calendar_events']['config']['oncopy_callback'][] = array('tl_calendar_events_tags', 'onCopy');
$GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default'] = str_replace("author", "author,tags", $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default']);
if (array_key_exists('tl_calendar_events', $GLOBALS['TL_DCA'])) {
$GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default'] = str_replace("author", "author,tags", $GLOBALS['TL_DCA']['tl_calendar_events']['palettes']['default']);
}
}
$GLOBALS['TL_DCA']['tl_calendar_events']['fields']['tags'] = array
(
Expand Down
4 changes: 3 additions & 1 deletion dca/tl_faq.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
}
if (!in_array('tl_article', $disabledObjects))
{
$GLOBALS['TL_DCA']['tl_faq']['palettes']['default'] = str_replace("author", "author,tags", $GLOBALS['TL_DCA']['tl_faq']['palettes']['default']);
if (array_key_exists('tl_faq', $GLOBALS['TL_DCA'])) {
$GLOBALS['TL_DCA']['tl_faq']['palettes']['default'] = str_replace("author", "author,tags", $GLOBALS['TL_DCA']['tl_faq']['palettes']['default']);
}
$GLOBALS['TL_DCA']['tl_faq']['config']['ondelete_callback'][] = array('tl_faq_tags', 'removeFAQ');
$GLOBALS['TL_DCA']['tl_faq']['config']['oncopy_callback'][] = array('tl_faq_tags', 'onCopy');
}
Expand Down
4 changes: 3 additions & 1 deletion dca/tl_member.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ public function onCopy($insertID, \DataContainer $dc)
{
$GLOBALS['TL_DCA']['tl_member']['config']['ondelete_callback'][] = array('tl_member_tags', 'deleteMember');
$GLOBALS['TL_DCA']['tl_member']['config']['oncopy_callback'][] = array('tl_member_tags', 'onCopy');
$GLOBALS['TL_DCA']['tl_member']['palettes']['default'] = str_replace("{address_legend", "{categories_legend},tags;{address_legend", $GLOBALS['TL_DCA']['tl_member']['palettes']['default']);
if (array_key_exists('tl_member', $GLOBALS['TL_DCA'])) {
$GLOBALS['TL_DCA']['tl_member']['palettes']['default'] = str_replace("{address_legend", "{categories_legend},tags;{address_legend", $GLOBALS['TL_DCA']['tl_member']['palettes']['default']);
}
}

$GLOBALS['TL_DCA']['tl_member']['fields']['tags'] = array
Expand Down
24 changes: 18 additions & 6 deletions dca/tl_module.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,24 @@ public function getNewsArchives()
$GLOBALS['TL_DCA']['tl_module']['palettes']['globalArticleList'] = '{title_legend},name,headline,type;{template_legend:hide},articlelist_template;{showtags_legend},hide_on_empty;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
$GLOBALS['TL_DCA']['tl_module']['palettes']['tagcontentlist'] = '{title_legend},name,headline,type;{object_selection_legend},objecttype,tagsource,pagesource;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
$GLOBALS['TL_DCA']['tl_module']['palettes']['taglistbycategory'] = '{title_legend},name,headline,type;{datasource_legend},tag_sourcetables,pagesource;{protected_legend:hide},protected;{expert_legend:hide},guests,cssID,space';
$GLOBALS['TL_DCA']['tl_module']['palettes']['newsreader'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newsreader']);
$GLOBALS['TL_DCA']['tl_module']['palettes']['newsarchive'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newsarchive']);
$GLOBALS['TL_DCA']['tl_module']['palettes']['newslist'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newslist']);
$GLOBALS['TL_DCA']['tl_module']['palettes']['eventlist'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,event_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['eventlist']);
$GLOBALS['TL_DCA']['tl_module']['palettes']['calendar'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['calendar']);
$GLOBALS['TL_DCA']['tl_module']['palettes']['eventreader'] = str_replace('{template_legend', '{showtags_legend},event_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['eventreader']);
if (array_key_exists('newsreader', $GLOBALS['TL_DCA']['tl_module']['palettes'])) {
$GLOBALS['TL_DCA']['tl_module']['palettes']['newsreader'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newsreader']);
}
if (array_key_exists('newsarchive', $GLOBALS['TL_DCA']['tl_module']['palettes'])) {
$GLOBALS['TL_DCA']['tl_module']['palettes']['newsarchive'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newsarchive']);
}
if (array_key_exists('newslist', $GLOBALS['TL_DCA']['tl_module']['palettes'])) {
$GLOBALS['TL_DCA']['tl_module']['palettes']['newslist'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,news_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['newslist']);
}
if (array_key_exists('eventlist', $GLOBALS['TL_DCA']['tl_module']['palettes'])) {
$GLOBALS['TL_DCA']['tl_module']['palettes']['eventlist'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore,event_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['eventlist']);
}
if (array_key_exists('calendar', $GLOBALS['TL_DCA']['tl_module']['palettes'])) {
$GLOBALS['TL_DCA']['tl_module']['palettes']['calendar'] = str_replace('{template_legend', '{showtags_legend},tag_filter,tag_ignore;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['calendar']);
}
if (array_key_exists('eventreader', $GLOBALS['TL_DCA']['tl_module']['palettes'])) {
$GLOBALS['TL_DCA']['tl_module']['palettes']['eventreader'] = str_replace('{template_legend', '{showtags_legend},event_showtags;{template_legend', $GLOBALS['TL_DCA']['tl_module']['palettes']['eventreader']);
}
$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'tag_topten';
$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'news_showtags';
$GLOBALS['TL_DCA']['tl_module']['palettes']['__selector__'][] = 'event_showtags';
Expand Down

0 comments on commit 33a04fa

Please sign in to comment.