Changeset 360 for trunk


Ignore:
Timestamp:
Jan 18, 2012, 1:42:13 PM (13 years ago)
Author:
chronos
Message:
  • Upraveno: Administrace síťových zařízení přesunuta do systémového modulu Network. Zde doplněny použité modely pro inicializaci databáze.
  • Upraveno: Relace ManyToMany má nyní vhodnější parametry pro sestavení pomocné tabulky.
Location:
trunk
Files:
1 added
1 deleted
4 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/Common/File.php

    r348 r360  
    11<?php
    22
    3 class File extends OldModule
     3class File
    44{
     5  var $Database;
     6 
    57  function __construct($Database)
    68  {
  • trunk/Model.php

    r353 r360  
    8282  }
    8383 
    84   function AddPropertyManyToMany($Name, $Column, $TargetModel, $TargetColumn)
     84  function AddPropertyManyToMany($TargetModel, $Relation, $ColumOwn, $ColumnTarget)
    8585  {     
    86     $this->Properties[] = array('Name' => $Name, 'Type' => PropertyManyToMany,
    87       'TargetModel' => $TargetModel, 'TargetColumn' => $TargetColumn,
    88       'Column' => $Column);
     86    $this->Properties[] = array('Type' => PropertyManyToMany,
     87      'TargetModel' => $TargetModel, 'Relation' => $Relation, 'ColumnOwn' => $ColumnOwn,
     88      'ColumnTarget' => $ColumnTarget);
    8989  }
    9090 
  • trunk/Modules/Module.php

    r358 r360  
    9393  `Installed` int(11) NOT NULL,
    9494  `Description` text COLLATE utf8_czech_ci NOT NULL,
     95  `Dependecies` varchar(255) COLLATE utf8_czech_ci NOT NULL,
    9596  PRIMARY KEY (`Id`)
    9697) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
     
    141142          'Version' => $Module->Version, 'Creator' => $Module->Creator,
    142143          'Description' => $Module->Description, 'License' => $Module->License,
    143           'Installed' => 0));
     144          'Installed' => 0, 'Dependecies' => implode(',', $Module->Dependencies)));
    144145        unset($Module);
    145146      } else throw new Exception('Missing class '.$ModuleClassName.' in module '.$ModuleName);
  • trunk/Modules/TV/TV.php

    r349 r360  
    111111    $this->AddPropertyInteger('Frequency');
    112112    $this->AddPropertyString('Norm');
    113     $this->AddPropertyString('HomePage');   
    114     $this->AddPropertyString('Language');   
    115     $this->AddPropertyString('ShortName');   
    116     $this->AddPropertyString('Stream');   
    117     $this->AddPropertyString('StreamWeb');   
    118     $this->AddPropertyString('SourceType');   
    119     $this->AddPropertyString('Category');   
     113    $this->AddPropertyString('HomePage');
     114    $this->AddPropertyString('Language');
     115    $this->AddPropertyString('ShortName');
     116    $this->AddPropertyString('Stream');
     117    $this->AddPropertyString('StreamWeb');
     118    $this->AddPropertyString('SourceType');
     119    $this->AddPropertyString('Category');
    120120  }
    121121}
  • trunk/global.php

    r358 r360  
    99include_once('Common/Error.php');
    1010include_once('Common/Code.php');
     11include_once('Common/Forms.php');
     12include_once('Common/File.php');
    1113include_once('module.php');
    12 include_once('forms.php');
    1314include_once('Modules/page.php');
    14 include_once('file.php');
    1515include_once('finance/bills.php');
    1616include_once('finance/finance.php');
Note: See TracChangeset for help on using the changeset viewer.