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

Issue 1097 fixed problems of poll list admin

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10162 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2012-02-21 08:52:36 +00:00
parent 93a9be41b4
commit 09fbca92b0
2 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

16
modules/poll/queries/getPollListWithMember.xml
View file

@ -1,14 +1,26 @@
<query id="getPollList" action="select"> <query id="getPollListWithMember" action="select">
<tables> <tables>
<table name="poll_title" alias="P" /> <table name="poll_title" alias="P" />
<table name="poll" alias="P2" />
<table name="member" alias="M" /> <table name="member" alias="M" />
</tables> </tables>
<columns> <columns>
<column name="*" /> <column name="P.poll_srl" alias="poll_srl" />
<column name="P.poll_index_srl" alias="poll_index_srl" />
<column name="P.title" alias="title" />
<column name="P.checkcount" alias="checkcount" />
<column name="P.poll_count" alias="poll_count" />
<column name="P.upload_target_srl" alias="upload_target_srl" />
<column name="P.ipaddress" alias="ipaddress" />
<column name="P.regdate" alias="poll_regdate" />
<column name="P2.stop_date" alias="poll_stop_date" />
<column name="M.*" />
</columns> </columns>
<conditions> <conditions>
<group pipe="and"> <group pipe="and">
<condition operation="equal" column="P.member_srl" var="M.member_srl" notnull="notnull" /> <condition operation="equal" column="P.member_srl" var="M.member_srl" notnull="notnull" />
<condition operation="equal" column="P2.member_srl" var="M.member_srl" notnull="notnull" pipe="and" />
<condition operation="equal" column="P2.poll_srl" var="P.poll_srl" notnull="notnull" pipe="and" />
<condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" pipe="and" /> <condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" pipe="and" />
</group> </group>
<condition operation="like" column="P.title" var="s_title" pipe="or"/> <condition operation="like" column="P.title" var="s_title" pipe="or"/>

5
modules/poll/tpl/poll_list.html
View file

@ -22,6 +22,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<th scope="col">{$lang->poll_join_count}</th> <th scope="col">{$lang->poll_join_count}</th>
<th scope="col">{$lang->author}</th> <th scope="col">{$lang->author}</th>
<th scope="col">{$lang->regdate}</th> <th scope="col">{$lang->regdate}</th>
<th scope="col">{$lang->poll_stop_date}</th>
<th scope="col"><input type="checkbox" data-name="cart"title="Check All" /></th> <th scope="col"><input type="checkbox" data-name="cart"title="Check All" /></th>
</tr> </tr>
</thead> </thead>
@ -32,6 +33,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<th scope="col">{$lang->poll_join_count}</th> <th scope="col">{$lang->poll_join_count}</th>
<th scope="col">{$lang->author}</th> <th scope="col">{$lang->author}</th>
<th scope="col">{$lang->regdate}</th> <th scope="col">{$lang->regdate}</th>
<th scope="col">{$lang->poll_stop_date}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th> <th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr> </tr>
</tfoot> </tfoot>
@ -42,7 +44,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<td><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td> <td><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
<td>{$val->poll_count}</td> <td>{$val->poll_count}</td>
<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td> <td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
<td>{zdate($val->regdate,"Y-m-d H:i")}</td> <td>{zdate($val->poll_regdate,"Y-m-d H:i")}</td>
<td>{zdate($val->poll_stop_date,"Y-m-d")}</td>
<td> <td>
<input type="checkbox" name="cart" value="{$val->poll_index_srl}" /> <input type="checkbox" name="cart" value="{$val->poll_index_srl}" />
</td> </td>