summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwjames5 <will@tekimaki.com>2009-01-24 18:40:54 +0000
committerwjames5 <will@tekimaki.com>2009-01-24 18:40:54 +0000
commitb1221d41fbec8db0531ebd4311a71765fab387fc (patch)
tree86f767479d111efaed3ea25231b31daf9bc26d2d
parent2c1518e59b0ad124050521a952b640f58a524bda (diff)
downloadpigeonholes-b1221d41fbec8db0531ebd4311a71765fab387fc.tar.gz
pigeonholes-b1221d41fbec8db0531ebd4311a71765fab387fc.tar.bz2
pigeonholes-b1221d41fbec8db0531ebd4311a71765fab387fc.zip
standardize search with 'find' param, removes find_objects - CUSTOM PACKAGE DEVELOPERS who use get_content_list_inc take notecvs up -dP
-rw-r--r--assign_content.php6
-rw-r--r--templates/assign_content.tpl8
2 files changed, 7 insertions, 7 deletions
diff --git a/assign_content.php b/assign_content.php
index 6e6b95d..2429d4f 100644
--- a/assign_content.php
+++ b/assign_content.php
@@ -1,6 +1,6 @@
<?php
/**
- * $Header: /cvsroot/bitweaver/_bit_pigeonholes/assign_content.php,v 1.14 2008/06/25 22:21:17 spiderr Exp $
+ * $Header: /cvsroot/bitweaver/_bit_pigeonholes/assign_content.php,v 1.15 2009/01/24 18:40:54 wjames5 Exp $
*
* Copyright ( c ) 2004 bitweaver.org
* Copyright ( c ) 2003 tikwiki.org
@@ -8,7 +8,7 @@
* All Rights Reserved. See copyright.txt for details and a complete list of authors.
* Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details
*
- * $Id: assign_content.php,v 1.14 2008/06/25 22:21:17 spiderr Exp $
+ * $Id: assign_content.php,v 1.15 2009/01/24 18:40:54 wjames5 Exp $
* @package pigeonholes
* @subpackage functions
*/
@@ -36,7 +36,7 @@ $gBitSmarty->assign( 'contentTypes', $contentTypes );
$gBitSmarty->assign( 'contentSelect', $contentSelect = !isset( $_REQUEST['content_type'] ) ? NULL : $_REQUEST['content_type'] );
$listHash = array(
- 'find' => ( empty( $_REQUEST['find_objects'] ) ? NULL : $_REQUEST['find_objects'] ),
+ 'find' => ( empty( $_REQUEST['find'] ) ? NULL : $_REQUEST['find'] ),
'sort_mode' => ( empty( $_REQUEST['sort_mode'] ) ? NULL : $_REQUEST['sort_mode'] ),
'max_records' => ( @BitBase::verifyId( $_REQUEST['max_records'] ) ) ? $_REQUEST['max_records'] : 10,
'include_members' => ( ( !empty( $_REQUEST['include'] ) && $_REQUEST['include'] == 'members' ) ? TRUE : FALSE ),
diff --git a/templates/assign_content.tpl b/templates/assign_content.tpl
index a0abc8f..adb25a0 100644
--- a/templates/assign_content.tpl
+++ b/templates/assign_content.tpl
@@ -43,7 +43,7 @@
{/forminput}
{forminput}
- <input type="text" value="{$smarty.request.find_objects}" name="find_objects" />&nbsp;
+ <input type="text" value="{$smarty.request.find}" name="find" />&nbsp;
{formhelp note="You can restrict the content listing to a given content type or apply a filter."}
{/forminput}
</div>
@@ -66,7 +66,7 @@
{form}
<input type="hidden" name="sort_mode" value="{$smarty.request.sort_mode}" />
<input type="hidden" name="include" value="{$smarty.request.include}" />
- <input type="hidden" name="find_objects" value="{$smarty.request.find_objects}" />
+ <input type="hidden" name="find" value="{$smarty.request.find}" />
<input type="hidden" name="max_records" value="{$smarty.request.max_records}" />
<input type="hidden" name="content_type" value="{$contentSelect}" />
<input type="hidden" name="root_structure_id" value="{$smarty.request.root_structure_id}" />
@@ -120,8 +120,8 @@
<table class="data">
<caption>{tr}Available Content{/tr}</caption>
<tr>
- <th>{smartlink ititle="Title" isort=title idefault=1 max_rows=$smarty.request.max_rows content_type=$contentSelect find_objects=$find_objects include=$smarty.request.include page=$page}</th>
- <th>{smartlink ititle="Content Type" isort=content_type_guid max_rows=$smarty.request.max_rows content_type=$contentSelect find_objects=$find_objects include=$smarty.request.include page=$page}</th>
+ <th>{smartlink ititle="Title" isort=title idefault=1 max_rows=$smarty.request.max_rows content_type=$contentSelect find=$smarty.request.find include=$smarty.request.include page=$page}</th>
+ <th>{smartlink ititle="Content Type" isort=content_type_guid max_rows=$smarty.request.max_rows content_type=$contentSelect find=$smarty.request.find include=$smarty.request.include page=$page}</th>
{if $assignableContent}
{foreach from=$pigeonList item=pigeon}
<th><abbr title="{$pigeon.title|escape}">{counter}</abbr></th>