Author: benj
Date: Thu Mar 17 17:22:51 2016
New Revision: 1662
URL: http://svn.gna.org/viewcvs/gdtc?rev=1662&view=rev
Log:
Fix the admin info search and a shitload of uncommited changes
Modified:
trunk/gdtc/include/search.php
Modified: trunk/gdtc/include/search.php
URL:
http://svn.gna.org/viewcvs/gdtc/trunk/gdtc/include/search.php?rev=1662&r1=1661&r2=1662&view=diff
==============================================================================
--- trunk/gdtc/include/search.php (original)
+++ trunk/gdtc/include/search.php Thu Mar 17 17:22:51 2016
@@ -153,10 +153,11 @@
{
foreach ( explode( ',', $fields [ $args [ "field${i}_field" ] ] [
'fields' ] ) as $field )
{
- if ( ! array_key_exists ( ucfirst($fields [ $field ] [ 'name' ]), $f
) )
- array_push ( $added_fields, Array ( 'name' => ucfirst($fields [
$field ] [ 'name' ]),
+ $name = $field;
+ if ( ! array_key_exists ( $name, $f ) )
+ array_push ( $added_fields, Array ( 'name' => $name,
'field' => $field ) );
- $f [ ucfirst($fields [ $field ] [ 'name' ]) ] = 1;
+ $f [ $name ] = 1;
}
}
@@ -297,6 +298,12 @@
$args [ 'field1_field' ] = 'actor_id';
$args [ 'field1_operand' ] = 'is';
$args [ 'field1_value' ] = $args [ 'q_actor_id' ];
+ }
+ else if ( array_key_exists ( 'quick', $args ) && $args [ 'quick' ] == 1 &&
preg_match ( '/^[0-9]+$/', $args [ 'field1_value' ] ) )
+ {
+ $args [ 'field1_field' ] = 'actor_id';
+ $args [ 'field1_operand' ] = 'is';
+ $args [ 'field1_value' ] = $args [ 'field1_value' ];
}
$result = gdtc_do_search ( $table, $args );
@@ -375,6 +382,9 @@
$format = $operands [ $args [ "field${field_no}_operand" ] ] [
'format' ];
if ( $fields [ $args [ "field${field_no}_field" ] ] [ 'type' ]
== 'string' )
{
+ $format = preg_replace ( '/\$1/',
+ '( REPLACE(\$1,\'\n\',\'<br/>\')
COLLATE utf8_general_ci )',
+ $format );
$format = preg_replace ( '/\$1/',
'( REPLACE(\$1,\' \',\'\') COLLATE
utf8_general_ci )',
$format );
@@ -486,6 +496,7 @@
" LEFT OUTER JOIN membership ON membership.actor_id =
actor.actor_id " .
" LEFT OUTER JOIN subscription ON subscription.membership_id =
membership.membership_id " .
" LEFT OUTER JOIN employee ON employee.entity_id =
entity.actor_id " .
+ // " LEFT OUTER JOIN contact ON contact.actor_id =
entity.actor_id " .
" LEFT OUTER JOIN person ON employee.person_id =
person.actor_id ";
$search_array [ 'entity' ] = sprintf
@@ -505,7 +516,7 @@
" CONCAT( person.firstname, ' ', person.name
) AS contact_name, " .
" membership.start_date AS m_start_date, " .
" membership.renewal_date AS m_renewal_date,
" .
- " entity.photo_file " .
+ " entity.photo_file, subscription.* " .
" FROM actor " .
" $entity_join_condition " .
" WHERE ( %s ( %s ) ) " .
@@ -529,6 +540,7 @@
" JOIN person ON person.actor_id = actor.actor_id " .
" LEFT OUTER JOIN membership ON membership.actor_id =
actor.actor_id " .
" LEFT OUTER JOIN subscription ON subscription.membership_id =
membership.membership_id " .
+ // " LEFT OUTER JOIN contact ON contact.actor_id =
person.actor_id " .
" LEFT OUTER JOIN questionnaire ON questionnaire.actor_id =
actor.actor_id ";
$search_array [ 'person' ] = sprintf
@@ -549,7 +561,7 @@
" '' as contact_name, " .
" membership.start_date as m_start_date, " .
" membership.renewal_date as m_renewal_date, " .
- " person.photo_file " .
+ " person.photo_file, subscription.* " .
" FROM actor " .
" $person_join_condition ".
" WHERE ( %s ( %s ) ) " .
_______________________________________________
Gdtc-commits mailing list
[email protected]
https://mail.gna.org/listinfo/gdtc-commits
