fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 03:01:43 +09:00
Code Issues Projects Releases Packages Wiki Activity

fixed #130 사이트맵에서 접근 권한 설정 시 그룹 선택 저장이 안 되는 문제 해결 (패치제공 @sejin7940)

Browse source
This commit is contained in:
bnu 2013-12-04 15:09:11 +09:00
parent 285797e777
commit d7e6309c76
2 changed files with 489 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1529,14 +1529,13 @@ class menuAdminController extends menu
}
else
{
if(is_array($exposure))
{
$args->group_srls = implode(',', $exposure);
}
else if($exposure && in_array($exposure,array('-1','-3')))
$exposure = explode(',', $exposure);
if(in_array($exposure, array('-1','-3')))
{
$args->group_srls = $exposure;
}
$args->group_srls = implode(',', $exposure);
}
$output = executeQuery('menu.updateMenuItem', $args);
@ -1557,6 +1556,7 @@ class menuAdminController extends menu
$grantList = $xml_info->grant;
if(!$grantList) $grantList = new stdClass;
$grantList->access = new stdClass();
$grantList->access->default = 'guest';
$grantList->manager = new stdClass();
@ -1586,6 +1586,7 @@ class menuAdminController extends menu
}
$grant->{$group_srls} = array();
}
if(count($grant))
{
$oModuleController = getController('module');

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

@ -822,7 +822,7 @@ function onSiteMapReceived(htData){
}
}
})
})
.bind("rename.jstree", function(event, data){
$("#siteMapTree").removeClass("_node_renaming");
})
@ -1881,9 +1881,9 @@ jQuery(function($){
showMenuSelector($(this).find('._menuSelector_menuTreeContainer'), htInfo.url);
}else{
// URL shortcut
var htInfo_url = htInfo.url;
htInfo_url = htInfo_url.replace(/&/g, '&');
htInfo.url = htInfo_url;
var htInfo_url = htInfo.url;
htInfo_url = htInfo_url.replace(/&/g, '&');
htInfo.url = htInfo_url;
$(this).find('a[href="#fix_linkUrl"]').click();
$(this).find('._url_link').val($('<div />').text(htInfo.url).text());
@ -2038,9 +2038,9 @@ jQuery(function($){
}
/*
[normal_btn] =>
[hover_btn] =>
[active_btn] =>
[normal_btn] =>
[hover_btn] =>
[active_btn] =>
*/
}
/*
@ -2350,7 +2350,7 @@ jQuery(function($){
}
// Output of $.param function used in exec_json does not have a representation for an empty array. So, use "[]" (string) instead.
if(vValue.length === 0) vValue = "[]";
if(vValue.length === 0) vValue = '';
return vValue.toString();
}
<!--@end-->
@ -3875,7 +3875,7 @@ jQuery(function($){
$('a._siteDesignSetupLink').attr('title', xe.lang.go_to_site_design_setup).click(function(){
$.xeMsgBox.alert(xe.lang.go_to_site_design_setup);
});
// Set #site height fix
// Set #site height fix
<!--@if(Mobile::isMobileCheckByAgent())-->
$._xeAdminVar.prevColumn = new Array();
$._xeAdminVar.prevColumn.push($('#site_map'));
@ -3935,7 +3935,8 @@ jQuery(function($){
var sPackageSrl = getParameterByName('continue_install_package');
var sPackageType = getParameterByName('continue_install_package_type');
if(sPackageSrl && sPackageType){
if(sPackageSrl && sPackageType)
{
$._xeAdminVar.isFromFtpSetup = true;
installPackage(sPackageSrl, sPackageType, null);
}
@ -3943,20 +3944,24 @@ jQuery(function($){
});
function getParameterByName(name){
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
var regexS = "[\\?&]" + name + "=([^&#]*)";
var regex = new RegExp(regexS);
var results = regex.exec(window.location.search);
if(results == null)
return "";
else
return decodeURIComponent(results[1].replace(/\+/g, " "));
name = name.replace(/[\[]/, "\\\[").replace(/[\]]/, "\\\]");
var regexS = "[\\?&]" + name + "=([^&#]*)";
var regex = new RegExp(regexS);
var results = regex.exec(window.location.search);
if(results == null)
{
return "";
}
else
{
return decodeURIComponent(results[1].replace(/\+/g, " "));
}
}
function formatUpdatedDateWithTime(sDate){
//20120106184020
//2012-01-06 18:40:20
return sDate.replace(/(....)(..)(..)(..)(..)(..)/, function(all, year, mon, day, hour, min, sec){
//return year+"-"+mon+"-"+day+" "+hour+":"+min+":"+sec;
return year+"-"+mon+"-"+day+" "+hour+":"+min;
@ -3966,7 +3971,6 @@ function formatUpdatedDateWithTime(sDate){
function formatUpdatedDate(sDate){
//20120106184020
//2012-01-06 18:40:20
return sDate.replace(/(....)(..)(..)(..)(..)(..)/, function(all, year, mon, day, hour, min, sec){
//return year+"-"+mon+"-"+day+" "+hour+":"+min+":"+sec;
return year+"-"+mon+"-"+day;
@ -3996,40 +4000,40 @@ top.fullSetupWinLoaded = function(){
jQuery.extend({
stringify : function stringify(obj) {
if ("JSON" in window) {
return JSON.stringify(obj);
}
stringify : function stringify(obj) {
if ("JSON" in window) {
return JSON.stringify(obj);
}
var t = typeof (obj);
if (t != "object" || obj === null) {
// simple data type
if (t == "string") obj = '"' + obj + '"';
var t = typeof (obj);
if (t != "object" || obj === null) {
// simple data type
if (t == "string") obj = '"' + obj + '"';
return String(obj);
} else {
// recurse array or object
var n, v, json = [], arr = (obj && obj.constructor == Array);
return String(obj);
} else {
// recurse array or object
var n, v, json = [], arr = (obj && obj.constructor == Array);
for (n in obj) {
v = obj[n];
t = typeof(v);
if (obj.hasOwnProperty(n)) {
if (t == "string") {
v = '"' + v + '"';
} else if (t == "object" && v !== null){
v = jQuery.stringify(v);
}
for (n in obj) {
v = obj[n];
t = typeof(v);
if (obj.hasOwnProperty(n)) {
if (t == "string") {
v = '"' + v + '"';
} else if (t == "object" && v !== null){
v = jQuery.stringify(v);
}
json.push((arr ? "" : '"' + n + '":') + String(v));
}
}
json.push((arr ? "" : '"' + n + '":') + String(v));
}
}
return (arr ? "[" : "{" )
return (arr ? "[" : "{" )
+ String(json)
+ (arr ? "]" : "}" );
}
}
}
}
});
//]]>
</script>