From 62d14f5abd6e10645f779275d6aa822200ccc24b Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Mon, 4 Jan 2021 01:33:21 +0900 Subject: [PATCH] Clean up poll.admin.model.php #1539 --- modules/poll/poll.admin.model.php | 39 ++++++++++++------------------- 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/modules/poll/poll.admin.model.php b/modules/poll/poll.admin.model.php index 036a31e8a..7a4f40622 100644 --- a/modules/poll/poll.admin.model.php +++ b/modules/poll/poll.admin.model.php @@ -19,11 +19,7 @@ class pollAdminModel extends poll */ function getPollList($args) { - $output = executeQueryArray('poll.getPollList', $args); - if(!$output->toBool()) return $output; - - //if($output->data && !is_array($output->data)) $output->data = array($output->data); - return $output; + return executeQueryArray('poll.getPollList', $args); } /** @@ -31,10 +27,7 @@ class pollAdminModel extends poll */ function getPollListWithMember($args) { - $output = executeQueryArray('poll.getPollListWithMember', $args); - if(!$output->toBool()) return $output; - - return $output; + return executeQueryArray('poll.getPollListWithMember', $args); } /** @@ -42,28 +35,26 @@ class pollAdminModel extends poll */ function getPollAdminTarget() { - $poll_srl = Context::get('poll_srl'); + //$poll_srl = Context::get('poll_srl'); $upload_target_srl = Context::get('upload_target_srl'); - $oDocumentModel = getModel('document'); - $oCommentModel = getModel('comment'); - - $oDocument = $oDocumentModel->getDocument($upload_target_srl); - - if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl); - - if($oComment && $oComment->isExists()) - { - $this->add('document_srl', $oComment->get('document_srl')); - $this->add('comment_srl', $oComment->get('comment_srl')); - } - elseif($oDocument->isExists()) + $oDocument = DocumentModel::getDocument($upload_target_srl); + if ($oDocument->isExists()) { $this->add('document_srl', $oDocument->get('document_srl')); } else { - $this->setError('msg_not_founded'); + $oComment = CommentModel::getComment($upload_target_srl); + if ($oComment->isExists()) + { + $this->add('document_srl', $oComment->get('document_srl')); + $this->add('comment_srl', $oComment->get('comment_srl')); + } + else + { + $this->setError('msg_not_founded'); + } } } }