Skip to content

BUG: Sample Data blog various issues #17930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 16, 2017
Merged

BUG: Sample Data blog various issues #17930

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9c85323
BUG: Sample Data blog various issues
infograf768 Sep 11, 2017
609f4c2
Correcting truncate code
infograf768 Sep 11, 2017
88daa64
Simplifying articles aliases creation
infograf768 Sep 11, 2017
ba47e90
Using unicode aliases when language is not using latin glyphs
infograf768 Sep 12, 2017
cca4fef
correct truncate (again)
infograf768 Sep 12, 2017
b26b55b
Makung sure unicodeslugs is reverted to the configuration settings
infograf768 Sep 14, 2017
be9978d
Tweak config reset
mbabker Sep 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 24 additions & 9 deletions plugins/sampledata/blog/blog.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function onAjaxSampledataApplyStep1()
'created_user_id' => $user->id,
'extension' => 'com_content',
'level' => 1,
'alias' => JApplicationHelper::stringURLSafe($categoryTitle),
'alias' => 'sample-blog' . $langSuffix,
'associations' => array(),
'description' => '',
'language' => $language,
Expand Down Expand Up @@ -160,7 +160,7 @@ public function onAjaxSampledataApplyStep1()
'created_user_id' => $user->id,
'extension' => 'com_content',
'level' => 1,
'alias' => JApplicationHelper::stringURLSafe($categoryTitle),
'alias' => 'sample-help' . $langSuffix,
'associations' => array(),
'description' => '',
'language' => $language,
Expand Down Expand Up @@ -226,7 +226,7 @@ public function onAjaxSampledataApplyStep1()
// Set values which are always the same.
$article['id'] = 0;
$article['created_user_id'] = $user->id;
$article['alias'] = JApplicationHelper::stringURLSafe($article['title']);
$article['alias'] = $i . 'sample' . JApplicationHelper::stringURLSafe($article['title']);
$article['language'] = $language;
$article['associations'] = array();
$article['state'] = 1;
Expand Down Expand Up @@ -304,8 +304,10 @@ public function onAjaxSampledataApplyStep2()
'description' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_MENU_' . $i . '_DESCRIPTION'),
);

// Calculate menutype.
$menu['menutype'] = JApplicationHelper::stringURLSafe($menu['title']);
// Calculate menutype. The number of characters allowed is 24.
$type = JHtmlString::truncate($menu['title'], 23, true, false);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not direct call a JHtml method. JHtml::_('string.truncate', $menu['title'], 23, true, false);


$menu['menutype'] = $i . $type;

$menuTable->load();
$menuTable->bind($menu);
Expand Down Expand Up @@ -349,6 +351,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_0_TITLE'),
'link' => 'index.php?option=com_content&view=category&layout=blog&id=' . $catids[0],
'component_id' => 22,
'alias' => 'blog' . $langSuffix,
'params' => array(
'layout_type' => 'blog',
'show_category_title' => 0,
Expand Down Expand Up @@ -376,6 +379,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_1_TITLE'),
'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[0],
'component_id' => 22,
'alias' => 'about' . $langSuffix,
'params' => array(
'info_block_position' => 0,
'show_category' => 0,
Expand All @@ -394,6 +398,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_2_TITLE'),
'link' => 'index.php?option=com_users&view=login',
'component_id' => 25,
'alias' => 'login' . $langSuffix,
'params' => array(
'logindescription_show' => 1,
'logoutdescription_show' => 1,
Expand All @@ -407,10 +412,11 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_3_TITLE'),
'link' => 'index.php?option=com_content&view=form&layout=edit',
'component_id' => 22,
'alias' => 'post' . $langSuffix,
'access' => 3,
'params' => array(
'enable_category' => 1,
'catid' => 9,
'catid' => $catids[0],
'menu_text' => 1,
'show_page_heading' => 0,
'secure' => 0,
Expand All @@ -421,6 +427,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_4_TITLE'),
'link' => 'index.php?option=com_content&view=article&id=' . $articleIds[1],
'component_id' => 22,
'alias' => 'working' . $langSuffix,
'params' => array(
'menu_text' => 1,
'show_page_heading' => 0,
Expand All @@ -433,6 +440,7 @@ public function onAjaxSampledataApplyStep2()
'link' => 'administrator',
'type' => 'url',
'component_id' => 0,
'alias' => 'siteadmin' . $langSuffix,
'browserNav' => 1,
'access' => 3,
'params' => array(
Expand All @@ -444,6 +452,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_6_TITLE'),
'link' => 'index.php?option=com_users&view=profile&layout=edit',
'component_id' => 25,
'alias' => 'changepassword' . $langSuffix,
'access' => 2,
'params' => array(
'menu_text' => 1,
Expand All @@ -456,6 +465,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_7_TITLE'),
'link' => 'index.php?option=com_users&view=login',
'component_id' => 25,
'alias' => 'logout' . $langSuffix,
'params' => array(
'logindescription_show' => 1,
'logoutdescription_show' => 1,
Expand Down Expand Up @@ -486,6 +496,7 @@ public function onAjaxSampledataApplyStep2()
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MENUS_ITEM_8_TITLE'),
'link' => 'index.php?option=com_users&view=login',
'component_id' => 25,
'alias' => 'authorlogin' . $langSuffix,
'params' => array(
'login_redirect_url' => 'index.php?Itemid=' . $menuIdsLevel1[0],
'logindescription_show' => 1,
Expand Down Expand Up @@ -518,6 +529,7 @@ public function onAjaxSampledataApplyStep2()
'link' => 'index.php?option=com_config&view=config&controller=config.display.config',
'parent_id' => $menuIdsLevel1[4],
'component_id' => 23,
'alias' => 'sitesettings' . $langSuffix,
'access' => 6,
'params' => array(
'menu_text' => 1,
Expand All @@ -531,6 +543,7 @@ public function onAjaxSampledataApplyStep2()
'link' => 'index.php?option=com_config&view=templates&controller=config.display.templates',
'parent_id' => $menuIdsLevel1[4],
'component_id' => 23,
'alias' => 'templatesettings' . $langSuffix,
'params' => array(
'menu_text' => 1,
'show_page_heading' => 0,
Expand Down Expand Up @@ -595,6 +608,8 @@ public function onAjaxSampledataApplyStep3()
// Get previously entered Data from UserStates
$menuTypes = $this->app->getUserState('sampledata.blog.menutypes');

$catids = $this->app->getUserState('sampledata.blog.articles.catids');

$modules = array(
array(
'title' => JText::_('PLG_SAMPLEDATA_BLOG_SAMPLEDATA_MODULES_MODULE_0_TITLE'),
Expand Down Expand Up @@ -674,7 +689,7 @@ public function onAjaxSampledataApplyStep3()
'position' => 'position-7',
'module' => 'mod_articles_popular',
'params' => array(
'catid' => ['9'],
'catid' => $catids[0],
'count' => 5,
'show_front' => 1,
'layout' => '_:default',
Expand All @@ -694,7 +709,7 @@ public function onAjaxSampledataApplyStep3()
'show_front' => 'show',
'count' => 6,
'category_filtering_type' => 1,
'catid' => ['9'],
'catid' => $catids[0],
'show_child_category_articles' => 0,
'levels' => 1,
'author_filtering_type' => 1,
Expand Down Expand Up @@ -954,7 +969,7 @@ private function addMenuItems(array $menuItems, $level)
// Set values which are always the same.
$menuItem['id'] = 0;
$menuItem['created_user_id'] = $user->id;
$menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['title']);
$menuItem['alias'] = JApplicationHelper::stringURLSafe($menuItem['alias']);
$menuItem['published'] = 1;
$menuItem['language'] = $language;
$menuItem['note'] = '';
Expand Down