Changeset 547


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Common/Form/Types/OneToMany.php

    r540 r547  
    6868      if(array_key_exists('View', $Type['Parameters'])) $Table = $Type['Parameters']['View'];
    6969        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 `'.
    7272        $Type['Parameters']['Id'].'`=`'.$Item['Name'].'`) AS `'.$Item['Name'].'_Filter`';
    7373    //} else $Output = '`'.$Item['Name'].'`, `'.$Item['Name'].'` AS `'.$Item['Name'].'_Filter`';
  • trunk/Common/Version.php

    r545 r547  
    11<?php
    22
    3 $Revision = 545; // Subversion revision
     3$Revision = 547; // Subversion revision
    44$DatabaseRevision = 535; // SQL structure revision
    5 $ReleaseTime = '2013-06-20';
     5$ReleaseTime = '2013-06-12';
    66
    77?>
  • trunk/Modules/IS/IS.php

    r545 r547  
    277277    // Get total filtered item count in database
    278278    $Columns = implode(',', $Columns);
    279     if($UserFilter != '')
     279    if($Filter != '')
    280280    {
    281281      $Query = 'SELECT COUNT(*) FROM (SELECT '.$Columns.' FROM `'.$FormClass['Table'].'`) AS `TS` '.$Filter;
     
    284284      $TotalFilteredCount = $DbRow[0];
    285285    } else $TotalFilteredCount = $TotalCount;
     286    echo($TotalFilteredCount.', ');
    286287    $PageList = GetPageList($TotalFilteredCount);   
    287288
     
    297298   
    298299    // Show search fields
    299     $Output .= '<tr><form action="?a=list&amp;t='.$Table.'&amp;filter=1" method="post">';
     300    if(array_key_exists('r', $_GET)) $Addition = '&amp;r='.$_GET['r'];
     301      else $Addition = '';
     302    $Output .= '<tr><form action="?a='.$_GET['a'].'&amp;t='.$Table.'&amp;filter=1'.$Addition.'" method="post">';
    300303    foreach($FormClass['Items'] as $ItemIndex => $FormItem)
    301304      if(!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
Note: See TracChangeset for help on using the changeset viewer.