merge & tag 1.4.3

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7597 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
haneul 2010-07-06 08:29:10 +00:00
parent 762ebbf445
commit 289973781a
200 changed files with 2296 additions and 1827 deletions

View file

@ -18,9 +18,8 @@
<action name="procWidgetDeleteDocument" type="controller" standalone="true" />
<action name="procWidgetGenerateCodeInPage" type="controller" standalone="true" />
<action name="procWidgetGetColorsetList" type="controller" standalone="true" />
<action name="procWidgetRemoveContents" type="controller" standalone="true" />
<action name="procWidgetStyleExtraImageUpload" type="controller" standalone="true" />
<action name="procWidgetStyleGenerateCodeInPage" type="controller" standalone="true" />
</actions>
</module>
</module>

View file

@ -64,10 +64,8 @@ function doStartPageModify(zoneID, module_srl) {
// 내용 모두 삭제
function removeAllWidget() {
if(!confirm(confirm_delete_msg)) return;
var response_tags = new Array('error','message');
var params = new Array();
params['module_srl'] = xGetElementById('pageFo').module_srl.value;
exec_xml('widget',"procWidgetRemoveContents",params,function() { restoreWidgetButtons(); xInnerHtml(zonePageObj,'') });
restoreWidgetButtons();
xInnerHtml(zonePageObj,'');
}
/**
@ -557,16 +555,7 @@ function doCheckWidget(e) {
var widget = p_obj.getAttribute("widget");
if(confirm(confirm_delete_msg)) {
restoreWidgetButtons();
if(p_obj.getAttribute('widget')=='widgetContent') {
var response_tags = new Array('error','message','document_srl');
var params = new Array();
params['document_srl'] =p_obj.getAttribute('document_srl');
exec_xml('widget','procWidgetDeleteDocument', params, completeDeleteWidgetContent, response_tags, params, p_obj);
return;
} else {
p_obj.parentNode.removeChild(p_obj);
}
p_obj.parentNode.removeChild(p_obj);
}
return;
}

View file

@ -223,44 +223,6 @@
if(!$output->toBool()) return $output;
}
/**
* @brief 내용 지우기
**/
function procWidgetRemoveContents() {
$module_srl = Context::get('module_srl');
if(!$module_srl) return new Object(-1,'msg_invalid_request');
// 대상 페이지 모듈 정보 구함
$oModuleModel = &getModel('module');
$page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
// 권한 체크
$is_logged = Context::get('is_logged');
$logged_info = Context::get('logged_info');
$user_group = $logged_info->group_list;
$is_admin = false;
if(count($user_group)&&count($page_info->grants['manager'])) {
$manager_group = $page_info->grants['manager'];
foreach($user_group as $group_srl => $group_info) {
if(in_array($group_srl, $manager_group)) $is_admin = true;
}
}
if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
// 등록된 글 목록 구함
$oDocumentModel = &getModel('document');
$oDocumentController = &getController('document');
$obj->module_srl = $module_srl;
$obj->list_count = 99999999;
$output = $oDocumentModel->getDocumentList($obj);
if(!$output->total_count) return new Object();
for($i=0;$i<$output->data;$i++) {
$oDocumentController->deleteDocument($output->data[$i]->document_srl, true);
}
return new Object();
}
/**
* @brief 위젯 코드를 Javascript로 수정/드래그등을 하기 위한 Javascript 수정 모드로 변환
**/