Changeset 760

Timestamp:

Oct 27, 2015, 12:06:52 AM (9 years ago)

Author:

chronos

Message:

• Added: Allow to hide some columns from IS lists.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (1 diff)
• Modules/IS/IS.php (modified) (3 diffs)
• Modules/Network/Network.php (modified) (1 diff)
• Modules/Scheduler/Scheduler.php (modified) (1 diff)
• Modules/Task/Task.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 759; // Subversion revision
+$Revision = 760; // Subversion revision
 $DatabaseRevision = 759; // SQL structure revision
 $ReleaseTime = strtotime('2015-10-26');

trunk/Modules/Finance/Finance.php

@@ -444 +444 @@
         'TimeEnd' => array('Type' => 'Date', 'Caption' => 'Čas zrušení', 'Default' => '', 'Null' => true),
         'Currency' => array('Type' => 'TCurrency', 'Caption' => 'Měna', 'Default' => ''),
-        'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno / token', 'Default' => ''),
-        'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => ''),
+        'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno / token', 'Default' => '', 'NotInList' => true),
+        'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => '', 'NotInList' => true),
         'Operations' => array('Type' => 'TFinanceOperationListAccount', 'Caption' => 'Operace', 'Default' => ''),
         'Use' => array('Type' => 'Boolean', 'Caption' => 'Používat', 'Default' => '0'),

trunk/Modules/IS/IS.php

@@ -477 +477 @@
         if($ExcludeColumn != $ItemIndex)
         if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+        if(!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
           $TableColumns[] = array('Name' => $ItemIndex, 'Title' => $FormItem['Caption']);
         $UseType = $UseType = $FormItem['Type'];
@@ -536 +537 @@
     foreach($FormClass['Items'] as $ItemIndex => $FormItem)
     if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+    if(!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
     if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
     (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and
@@ -558 +560 @@
       foreach($FormClass['Items'] as $ItemIndex => $FormItem)
       if(!array_key_exists('Hidden', $FormItem) or ($FormItem['Hidden'] == false))
+      if(!array_key_exists('NotInList', $FormItem) or ($FormItem['NotInList'] == false))
       if((!array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) or
       (array_key_exists($FormItem['Type'], $this->System->FormManager->FormTypes) and

trunk/Modules/Network/Network.php

@@ -156 +156 @@
         'MapPosition' => array('Type' => 'TMapPosition', 'Caption' => 'Pozice na mapě', 'Default' => '0', 'Null' => true),
         'Product' => array('Type' => 'TProduct', 'Caption' => 'Produkt', 'Default' => '', 'Null' => true),
-        'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => '', 'Null' => true),
-        'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => '', 'Null' => true),
+        'LoginName' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => '', 'Null' => true, 'NotInList' => true),
+        'LoginPassword' => array('Type' => 'String', 'Caption' => 'Přihlašovací heslo', 'Default' => '', 'Null' => true, 'NotInList' => true),
         'API' => array('Type' => 'TDeviceAPIType', 'Caption' => 'API', 'Default' => '', 'Null' => true),
       ),

trunk/Modules/Scheduler/Scheduler.php

@@ -26 +26 @@
         'Action' => array('Type' => 'TSchedulerAction', 'Caption' => 'Akce', 'Default' => ''),
         'Period' => array('Type' => 'Integer', 'Caption' => 'Opakovat po', 'Default' => '', 'Null' => true, 'Suffix' => 'sekund'),
-        'Log' => array('Type' => 'Text', 'Caption' => 'Poslední záznam', 'Default' => '', 'ReadOnly' => true),
         'LastExecutedTime' => array('Type' => 'DateTime', 'Caption' => 'Čas posledního spuštění', 'Default' => '', 'ReadOnly' => true),
         'Duration' => array('Type' => 'TimeDiff', 'Caption' => 'Trvání', 'Default' => '', 'ReadOnly' => true),
+        'Log' => array('Type' => 'Text', 'Caption' => 'Poslední záznam', 'Default' => '', 'ReadOnly' => true, 'NotInList' => true),
       ),
     ));

trunk/Modules/Task/Task.php

@@ -23 +23 @@
       'Items' => array(
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => '', 'Required' => true),
-        'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => ''),
         'TimeCreate' => array('Type' => 'Date', 'Caption' => 'Datum zadání', 'Default' => '', 'Required' => true),
         'TimeDue' => array('Type' => 'Date', 'Caption' => 'Termín', 'Default' => '', 'Null' => true),
         'TimeClose' => array('Type' => 'Date', 'Caption' => 'Datum uzavření', 'Default' => '', 'Null' => true),
         'Priority' => array('Type' => 'TPriority', 'Caption' => 'Důležitost', 'Default' => 1),
-        'Conclusion' => array('Type' => 'Text', 'Caption' => 'Vyhodnocení', 'Default' => ''),
         'Public' => array('Type' => 'Boolean', 'Caption' => 'Veřejné', 'Default' => '0'),
         'Progress' => array('Type' => 'Integer', 'Caption' => 'Průběh', 'Default' => '0', 'Suffix' => '%'),
         'Group' => array('Type' => 'TTaskGroup', 'Caption' => 'Kategorie', 'Default' => '', 'Null' => true),
+        'Description' => array('Type' => 'Text', 'Caption' => 'Popis', 'Default' => '', 'NotInList' => true),
+        'Conclusion' => array('Type' => 'Text', 'Caption' => 'Vyhodnocení', 'Default' => '', 'NotInList' => true),
         'AssignedTo' => array('Type' => 'TUser', 'Caption' => 'Přiřazeno', 'Default' => '', 'Null' => true),
         'Work' => array('Type' => 'TWorkListTask', 'Caption' => 'Práce', 'Default' => ''),

trunk/Modules/User/User.php

@@ -192 +192 @@
         'Login' => array('Type' => 'String', 'Caption' => 'Přihlašovací jméno', 'Default' => ''),
         'Name' => array('Type' => 'String', 'Caption' => 'Celé jméno', 'Default' => ''),
-        'Salt' => array('Type' => 'RandomHash', 'Caption' => 'Sůl', 'Default' => ''),
-        'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => '', 'Method' => 'DoubleSHA1'),
+        'Salt' => array('Type' => 'RandomHash', 'Caption' => 'Sůl', 'Default' => '', 'NotInList' => true),
+        'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => '', 'Method' => 'DoubleSHA1', 'NotInList' => true),
         'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
         'LastIpAddress' => array('Type' => 'IPv4Address', 'Caption' => 'Poslední IP adresa', 'Default' => '', 'ReadOnly' => true),