Changeset 662

Timestamp:

May 31, 2014, 11:53:31 PM (10 years ago)

Author:

chronos

Message:

• Upraveno: ICQ kontakty převedeny z tabulky uživatelů do tabulky Kontakty.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Common/Setup/Updates.php (modified) (2 diffs)
• Modules/Subject/Subject.php (modified) (3 diffs)
• Modules/User/User.php (modified) (2 diffs)
• images/favicons/Contact.png (added)

trunk/Application/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 661; // Subversion revision
-$DatabaseRevision = 661; // SQL structure revision
+$Revision = 662; // Subversion revision
+$DatabaseRevision = 662; // SQL structure revision
 $ReleaseTime = strtotime('2014-05-31');

trunk/Common/Setup/Updates.php

@@ -773 +773 @@
 }
 
+function UpdateTo662($Manager)
+{
+  $Manager->Execute('INSERT INTO `Contact` (SELECT NULL AS `Id`, 2 AS `Category`, `ICQ` AS `Value`, NULL AS `Subject`, `Id` AS `User` FROM `User`
+WHERE (`ICQ` != "") AND (`ICQ` != 0))');
+  $Manager->Execute('ALTER TABLE `User` DROP `ICQ`;');
+  $Manager->Execute('INSERT INTO `ActionIcon` (`Id`, `Name`) VALUES (NULL, "Contact.png");');
+  $IconId = $Manager->Database->insert_id;
+  $Manager->Execute('UPDATE `Action` SET `Icon` = '.$IconId.' WHERE `Title`="Kontakty"');
+
+}
+
 class Updates
 {
@@ -814 +825 @@
       647 => array('Revision' => 657, 'Function' => 'UpdateTo657'),
       657 => array('Revision' => 661, 'Function' => 'UpdateTo661'),
+      661 => array('Revision' => 662, 'Function' => 'UpdateTo662'),
     ));
   }

trunk/Modules/Subject/Subject.php

@@ -66 +66 @@
       'Filter' => '1',
     ));
-    $this->System->FormManager->RegisterFormType('TContactList', array(
+    $this->System->FormManager->RegisterFormType('TContactListCategory', array(
       'Type' => 'ManyToOne',
       'Table' => 'Contact',
@@ -73 +73 @@
       'Filter' => '1',
     ));
+    $this->System->FormManager->RegisterFormType('TContactListUser', array(
+      'Type' => 'ManyToOne',
+      'Table' => 'Contact',
+      'Id' => 'Id',
+      'Ref' => 'User',
+      'Filter' => '1',
+    ));
     $this->System->FormManager->RegisterClass('Contact', array(
-      'Title' => 'Kontaktu',
+      'Title' => 'Kontakty',
       'Table' => 'Contact',
       'Items' => array(
@@ -88 +95 @@
       'Items' => array(
         'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
-        'Items' => array('Type' => 'TContactList', 'Caption' => 'Kontakty'),
+        'Items' => array('Type' => 'TContactListCategory', 'Caption' => 'Kontakty'),
       ),
     ));

trunk/Modules/User/User.php

@@ -558 +558 @@
         'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
         'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefón', 'Default' => ''),
-        'ICQ' => array('Type' => 'String', 'Caption' => 'ICQ', 'Default' => ''),
       ),
     ));
@@ -598 +597 @@
         'RegistrationTime' => array('Type' => 'DateTime', 'Caption' => 'Čas registrace', 'Default' => ''),
         'Locked' => array('Type' => 'Boolean', 'Caption' => 'Uzamčen', 'Default' => ''),
-        'ICQ' => array('Type' => 'String', 'Caption' => 'ICQ', 'Default' => ''),
         'PhoneNumber' => array('Type' => 'String', 'Caption' => 'Telefon', 'Default' => ''),
         'UserRel' => array('Type' => 'TUserCustomerRelListUser', 'Caption' => 'Přístup k zákazníkům', 'Default' => ''),
         'Permission' => array('Type' => 'TPermissionUserAssignmentListUser', 'Caption' => 'Oprávnění', 'Default' => ''),
+        'Contatcs' => array('Type' => 'TContactListUser', 'Caption' => 'Kontakty', 'Default' => ''),
       ),
     ));