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

Fix #1432 incorrect redirect in widget document edit popup

Browse source
This commit is contained in:
Kijin Sung 2020-10-21 23:57:37 +09:00
parent 3344a20eb5
commit 9752c2ed61
3 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/module/ModuleHandler.class.php
View file

@ -175,7 +175,7 @@ class ModuleHandler extends Handler
}
// Get module info from document_srl.
if($this->document_srl)
if($this->document_srl && !$this->module)
{
$module_info = $this->_checkDocumentSrl();
if ($module_info === false)

1
common/framework/router.php
View file

@ -122,6 +122,7 @@ class Router
{
@parse_str(substr($url, $argstart + 1), $args);
$url = substr($url, 0, $argstart);
$result->args = $args;
}
// Decode the URL into plain UTF-8.

12
modules/widget/tpl/js/widget.js
View file

@ -424,8 +424,16 @@ function doCheckWidget(e) {
var widgetstyle = p_obj.getAttribute("widgetstyle");
if(!widget) return;
selectedWidget = p_obj;
if(widget == 'widgetContent') popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl"), "addContent");
else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
var url, name;
if(widget == 'widgetContent') {
url = request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl");
name = 'addContent';
} else {
url = request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle;
name = 'GenerateCodeInPage';
}
console.log(url, name);
popopen(url, name);
return;
// 위젯 스타일