Changeset 547
- Timestamp:
- Jun 13, 2013, 12:47:32 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Common/Form/Types/OneToMany.php
r540 r547 68 68 if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View']; 69 69 else $Table = $Type['Parameters']['Table']; 70 $Output = '`'.$Item['Name'].'`, (SELECT '.$Type['Parameters']['Name'].71 ' AS `Name` FROM `'.$Table.'`WHERE `'.70 $Output = '`'.$Item['Name'].'`, (SELECT `'.$Type['Parameters']['Name'].'`'. 71 ' AS `Name` FROM '.$Table.' WHERE `'. 72 72 $Type['Parameters']['Id'].'`=`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`'; 73 73 //} else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`'; -
trunk/Common/Version.php
r545 r547 1 1 <?php 2 2 3 $Revision = 54 5; // Subversion revision3 $Revision = 547; // Subversion revision 4 4 $DatabaseRevision = 535; // SQL structure revision 5 $ReleaseTime = '2013-06- 20';5 $ReleaseTime = '2013-06-12'; 6 6 7 7 ?> -
trunk/Modules/IS/IS.php
r545 r547 277 277 // Get total filtered item count in database 278 278 $Columns = implode(',', $Columns); 279 if($ UserFilter != '')279 if($Filter != '') 280 280 { 281 281 $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM `'.$FormClass['Table'].'`) AS `TS` '.$Filter; … … 284 284 $TotalFilteredCount = $DbRow[0]; 285 285 } else $TotalFilteredCount = $TotalCount; 286 echo($TotalFilteredCount.', '); 286 287 $PageList = GetPageList($TotalFilteredCount); 287 288 … … 297 298 298 299 // Show search fields 299 $Output .= '<tr><form action="?a=list&t='.$Table.'&filter=1" method="post">'; 300 if(array_key_exists('r', $_GET)) $Addition = '&r='.$_GET['r']; 301 else $Addition = ''; 302 $Output .= '<tr><form action="?a='.$_GET['a'].'&t='.$Table.'&filter=1'.$Addition.'" method="post">'; 300 303 foreach($FormClass['Items'] as $ItemIndex => $FormItem) 301 304 if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
Note:
See TracChangeset
for help on using the changeset viewer.