fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-10 12:32:14 +09:00
Code Issues Projects Releases Packages Wiki Activity

issue 70 bug fix in content menu

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@8790 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-08-17 08:19:22 +00:00
parent c244091f26
commit b3eb4ac938
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/comment/comment.admin.view.php
View file

@ -33,7 +33,13 @@
$output = $oCommentModel->getTotalCommentList($args, $columnList); $output = $oCommentModel->getTotalCommentList($args, $columnList);
// get total comment count group by is_secret status // get total comment count group by is_secret status
$tmp->search_target = Context::get('search_target');
$tmp->search_keyword = Context::get('search_keyword');
Context::set('search_target', '');
Context::set('search_keyword', '');
$countOutput = $oCommentModel->getTotalCommentCount($args); $countOutput = $oCommentModel->getTotalCommentCount($args);
Context::set('search_target', $tmp->search_target);
Context::set('search_keyword', $tmp->search_keyword);
// set values in the return object of comment_model:: getTotalCommentList() in order to use a template. // set values in the return object of comment_model:: getTotalCommentList() in order to use a template.
Context::set('total_count', $output->total_count); Context::set('total_count', $output->total_count);

2
modules/comment/tpl/comment_list.html
View file

@ -11,8 +11,6 @@
<!--@foreach($countOutput AS $key=>$value)--> <!--@foreach($countOutput AS $key=>$value)-->
| <a href="{getUrl('search_target','is_secret','search_keyword', $value->is_secret)}">{$secret_name_list[$value->is_secret]}({$value->count})</a> | <a href="{getUrl('search_target','is_secret','search_keyword', $value->is_secret)}">{$secret_name_list[$value->is_secret]}({$value->count})</a>
<!--@end--> <!--@end-->
| <a href="#">{$lang->accusation}(#)</a>
| <a href="#">{$lang->trash}(#)</a>
<div class="side"> <div class="side">
<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getCommentList();">{$lang->comment_manager}...</a></span> <span class="btn"><a href="#listManager" class="modalAnchor" onclick="getCommentList();">{$lang->comment_manager}...</a></span>
</div> </div>

2
modules/document/tpl/document_list.html
View file

@ -12,8 +12,6 @@
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}({$statusCount['PUBLIC']})</a> | <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}({$statusCount['PUBLIC']})</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}({$statusCount['SECRET']})</a> | <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}({$statusCount['SECRET']})</a>
| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}({$statusCount['TEMP']})</a> | <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}({$statusCount['TEMP']})</a>
| <a href="#">{$lang->accusation}(#)</a>
| <a href="#">{$lang->trash}(#)</a>
<div class="side"> <div class="side">
<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span> <span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
</div> </div>

4
modules/file/file.admin.model.php
View file

@ -53,8 +53,8 @@
/** /**
* @brief Return number of attachments which belongs to a specific document * @brief Return number of attachments which belongs to a specific document
**/ **/
function getFilesCountByGroupValid($obj) { function getFilesCountByGroupValid($obj = '') {
$this->_makeSearchParam($obj, $args); //$this->_makeSearchParam($obj, $args);
$output = executeQueryArray('file.getFilesCountByGroupValid', $args); $output = executeQueryArray('file.getFilesCountByGroupValid', $args);
return $output->data; return $output->data;

2
modules/file/file.admin.view.php
View file

@ -155,7 +155,7 @@
} }
} }
$countOutput = $oFileAdminModel->getFilesCountByGroupValid($args); $countOutput = $oFileAdminModel->getFilesCountByGroupValid();
$validCount = array(); $validCount = array();
if(is_array($countOutput)) if(is_array($countOutput))
{ {

3
modules/file/tpl/file_list.html
View file

@ -10,7 +10,6 @@
All({number_format($total_count)}) All({number_format($total_count)})
| <a href="{getUrl('search_target','isvalid','search_keyword','Y')}">{$lang->is_valid}({number_format((int)$valid_count['Y'])})</a> | <a href="{getUrl('search_target','isvalid','search_keyword','Y')}">{$lang->is_valid}({number_format((int)$valid_count['Y'])})</a>
| <a href="{getUrl('search_target','isvalid','search_keyword','N')}">{$lang->is_stand_by}({number_format((int)$valid_count['N'])})</a> | <a href="{getUrl('search_target','isvalid','search_keyword','N')}">{$lang->is_stand_by}({number_format((int)$valid_count['N'])})</a>
| <a href="#">{$lang->trash}(#)</a>
<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor">{$lang->file_manager}...</a></span></span> <span class="side"><span class="btn"><a href="#listManager" class="modalAnchor">{$lang->file_manager}...</a></span></span>
</caption> </caption>
<thead> <thead>
@ -87,7 +86,7 @@
<td><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td> <td><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
<td><!--@if($val->isvalid=='Y')-->{$lang->is_valid}<!--@else-->{$lang->is_stand_by}<!--@end--></td> <td><!--@if($val->isvalid=='Y')-->{$lang->is_valid}<!--@else-->{$lang->is_stand_by}<!--@end--></td>
<td> <td>
<input type="checkbox" name="cart[]" value="{$val->file_srl}" onclick="addCart(this.value)" <!--@if($val->isCarted)-->checked="checked"<!--@end--> /> <input type="checkbox" name="cart" value="{$val->file_srl}" onclick="addCart(this.value)" <!--@if($val->isCarted)-->checked="checked"<!--@end--> />
</td> </td>
</tr> </tr>
<!--@endforeach--> <!--@endforeach-->