mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-05 11:32:12 +09:00
issue 70 file module UX changed
document module develope for document management git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8679 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
99d36039e9
commit
aadeda4f55
23 changed files with 444 additions and 261 deletions
|
|
@ -1532,14 +1532,15 @@ class documentController extends document {
|
|||
if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
|
||||
|
||||
$type = Context::get('type');
|
||||
$module_srl = Context::get('target_module');
|
||||
$target_module = Context::get('target_module');
|
||||
$module_srl = Context::get('module_srl');
|
||||
$category_srl = Context::get('target_category');
|
||||
$message_content = Context::get('message_content');
|
||||
if($message_content) $message_content = nl2br($message_content);
|
||||
|
||||
$cart = Context::get('cart');
|
||||
if($cart) $document_srl_list = explode('|@|', $cart);
|
||||
else $document_srl_list = array();
|
||||
if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
|
||||
else $document_srl_list = $cart;
|
||||
|
||||
$document_srl_count = count($document_srl_list);
|
||||
// Send a message
|
||||
|
|
@ -1613,6 +1614,11 @@ class documentController extends document {
|
|||
$_SESSION['document_management'] = array();
|
||||
|
||||
$this->setMessage($msg_code);
|
||||
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
|
||||
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList');
|
||||
$this->setRedirectUrl($returnUrl);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
function procDocumentInsertModuleConfig()
|
||||
|
|
@ -1708,11 +1714,17 @@ class documentController extends document {
|
|||
}
|
||||
}
|
||||
|
||||
if(count($documentSrlList)) {
|
||||
if(count($documentSrlList) > 0) {
|
||||
$oDocumentModel = &getModel('document');
|
||||
$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin);
|
||||
$this->add('document_list', $documentList);
|
||||
}
|
||||
else
|
||||
{
|
||||
global $lang;
|
||||
$documentList = array();
|
||||
$this->setMessage($lang->no_documents);
|
||||
}
|
||||
$this->add('document_list', $documentList);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue