fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-11 21:12:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #2232 enable multilang in sitemap (top-level menu) name

Browse source
This commit is contained in:
Kijin Sung 2023-12-19 22:06:51 +09:00
parent 083c9814d3
commit 8d4706ec75
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/menu/menu.admin.controller.php
View file

@ -90,7 +90,7 @@ class MenuAdminController extends Menu
{ {
$args = new stdClass(); $args = new stdClass();
$args->site_srl = $siteSrl; $args->site_srl = $siteSrl;
$args->title = $title; $args->title = escape($title, true, true);
$args->menu_srl = getNextSequence(); $args->menu_srl = getNextSequence();
$args->listorder = $args->menu_srl * -1; $args->listorder = $args->menu_srl * -1;
@ -234,7 +234,7 @@ class MenuAdminController extends Menu
{ {
// List variables // List variables
$args = new stdClass(); $args = new stdClass();
$args->title = Context::get('title'); $args->title = escape(Context::get('title'), true, true);
$args->menu_srl = Context::get('menu_srl'); $args->menu_srl = Context::get('menu_srl');
$output = executeQuery('menu.updateMenu', $args); $output = executeQuery('menu.updateMenu', $args);

6
modules/menu/menu.admin.model.php
View file

@ -532,7 +532,8 @@ class MenuAdminModel extends Menu
} }
$menuItems->menuSrl = $output->menu_srl; $menuItems->menuSrl = $output->menu_srl;
$menuItems->title = $output->title; $menuItems->menuNameKey = $output->title;
$menuItems->title = Context::replaceUserLang($value->title);
$menuItems->menuItems = $menu; $menuItems->menuItems = $menu;
$menuList[] = $menuItems; $menuList[] = $menuItems;
} }
@ -583,7 +584,8 @@ class MenuAdminModel extends Menu
$menuItems = new stdClass(); $menuItems = new stdClass();
$menuItems->menuSrl = $value->menu_srl; $menuItems->menuSrl = $value->menu_srl;
$menuItems->title = $value->title; $menuItems->menuNameKey = $value->title;
$menuItems->title = Context::replaceUserLang($value->title);
$menuItems->menuItems = $menu; $menuItems->menuItems = $menu;
// If include home menu, move first // If include home menu, move first

9
modules/menu/tpl/sitemap.html
View file

@ -64,7 +64,7 @@
<ul class="_itemList"> <ul class="_itemList">
<li> <li>
<label for="sitemapName">{$lang->sitemap_name}</label> <label for="sitemapName">{$lang->sitemap_name}</label>
<input id="sitemapName" class="_sitemapName" type="text" required> <input id="sitemapName" class="_sitemapName lang_code" type="text" required>
</li> </li>
</ul> </ul>
<div class="btnBoth"> <div class="btnBoth">
@ -98,7 +98,7 @@
<ul class="_itemList"> <ul class="_itemList">
<li> <li>
<label for="sitemapName2">{$lang->sitemap_name}</label> <label for="sitemapName2">{$lang->sitemap_name}</label>
<input id="sitemapName2" class="_sitemapName" type="text" required> <input id="sitemapName2" class="_sitemapName lang_code" type="text" required>
</li> </li>
</ul> </ul>
<div class="btnBoth"> <div class="btnBoth">
@ -1577,7 +1577,7 @@ jQuery(function($){
var $panel = $('#add_sitemap'); var $panel = $('#add_sitemap');
var sTitle = $panel.find('INPUT._sitemapName').val();; var sTitle = $panel.find('INPUT._sitemapName').val();
var params = {}; var params = {};
params['title'] = sTitle; params['title'] = sTitle;
$.exec_json("menu.procMenuAdminInsert", params, function(htData){ $.exec_json("menu.procMenuAdminInsert", params, function(htData){
@ -1594,7 +1594,8 @@ jQuery(function($){
var htInfo = htNodeInfo[sMenuId]; var htInfo = htNodeInfo[sMenuId];
var $panel = $(this); var $panel = $(this);
$panel.find('INPUT._sitemapName').val(htInfo.title); $panel.find('input._sitemapName').val(htInfo.menuNameKey.match(/\$user_lang->/) ? htInfo.menuNameKey : htInfo.title.escape(false).unescape());
$panel.find('.lang_code').trigger('reload-multilingual');
}); });
$('#sitemap_general ._save').click(function(){ $('#sitemap_general ._save').click(function(){
var sTitle = $('#sitemap_general INPUT._sitemapName').val(); var sTitle = $('#sitemap_general INPUT._sitemapName').val();