Changeset 547 for trunk

Timestamp:

Jun 13, 2013, 12:47:32 AM (11 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení položek IS, které měli kaskádové načítání hodnot mezi tabulkami.
• Opraveno: Zobrazování stránkování u podtabulek při zobrazení položky ISu.

Location:

trunk

Files:

• Common/Form/Types/OneToMany.php (modified) (1 diff)
• Common/Version.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (3 diffs)

trunk/Common/Form/Types/OneToMany.php

@@ -68 +68 @@
       if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
         else $Table = $Type['Parameters']['Table'];
-      $Output = '`'.$Item['Name'].'`, (SELECT '.$Type['Parameters']['Name'].
-        ' AS `Name` FROM `'.$Table.'` WHERE `'.
+      $Output = '`'.$Item['Name'].'`, (SELECT `'.$Type['Parameters']['Name'].'`'.
+        ' AS `Name` FROM '.$Table.' WHERE `'.
         $Type['Parameters']['Id'].'`=`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`';
     //} else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 545; // Subversion revision
+$Revision = 547; // Subversion revision
 $DatabaseRevision = 535; // SQL structure revision
-$ReleaseTime = '2013-06-20';
+$ReleaseTime = '2013-06-12';
 
 ?>

trunk/Modules/IS/IS.php

@@ -277 +277 @@
     // Get total filtered item count in database
     $Columns = implode(',', $Columns);
-    if($UserFilter != '')
+    if($Filter != '') 
     {
       $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM `'.$FormClass['Table'].'`) AS `TS` '.$Filter;
@@ -284 +284 @@
       $TotalFilteredCount = $DbRow[0];
     } else $TotalFilteredCount = $TotalCount;
+    echo($TotalFilteredCount.', ');
     $PageList = GetPageList($TotalFilteredCount);   
 
@@ -297 +298 @@
     
     // Show search fields
-    $Output .= '<tr><form action="?a=list&amp;t='.$Table.'&amp;filter=1" method="post">';
+    if(array_key_exists('r', $_GET)) $Addition = '&amp;r='.$_GET['r'];
+      else $Addition = '';
+    $Output .= '<tr><form action="?a='.$_GET['a'].'&amp;t='.$Table.'&amp;filter=1'.$Addition.'" method="post">';
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
       if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or