모듈별 설정을 가져올때 site_srl을 반영받도록 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6356 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2009-05-22 08:53:52 +00:00
parent 04a11afb14
commit 7f6433dd1c
3 changed files with 11 additions and 5 deletions

View file

@ -828,8 +828,9 @@
/**
* @brief mid별 모듈 설정 정보 전체를 구함
**/
function getModulePartConfigs($module) {
function getModulePartConfigs($module, $site_srl = 0) {
$args->module = $module;
if($site_srl) $args->site_srl = $site_srl;
$output = executeQueryArray('module.getModulePartConfigs', $args);
if(!$output->toBool() || !$output->data) return array();

View file

@ -1,12 +1,15 @@
<query id="getModulePartConfigs" action="select">
<tables>
<table name="module_part_config" />
<table name="modules" />
</tables>
<columns>
<column name="module_srl" />
<column name="config" />
<column name="module_part_config.module_srl" alais="module_srl" />
<column name="module_part_config.config" alias="config" />
</columns>
<conditions>
<condition operation="equal" column="module" var="module" notnull="notnull" />
<condition operation="equal" column="module_part_config.module" var="module" notnull="notnull" />
<condition operation="equal" column="modules.module_srl" default="module_part_config.module_srl" pipe="and" />
<condition operation="equal" column="modules.site_srl" var="site_srl" pipe="and" />
</conditions>
</query>

View file

@ -23,6 +23,8 @@
/**
* 피드 출력을 위한 변수 설정
**/
$site_module_info = Context::get('site_module_info');
$site_srl = $site_module_info->site_srl;
$mid = Context::get('mid'); ///< 대상 모듈 id, 없으면 전체로
$start_date = (int)Context::get('start_date');
$end_date = (int)Context::get('end_date');
@ -46,7 +48,7 @@
// mid 가 선택되어 있지 않으면 전체
} else {
if($total_config->use_total_feed != 'N') {
$rss_config = $oModuleModel->getModulePartConfigs('rss');
$rss_config = $oModuleModel->getModulePartConfigs('rss', $site_srl);
if($rss_config) {
foreach($rss_config as $module_srl => $config) {
if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N') {