Changeset 895 for trunk/Modules/User/UserModel.php
- Timestamp:
- Jan 12, 2021, 10:29:50 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modules/User/UserModel.php
r894 r895 75 75 $Desc->AddString('Salt'); 76 76 $Desc->AddString('Email'); 77 $Desc->AddString('LastIpAddress'); 78 $Desc->AddString('LastLoginTime'); 77 $Column = $Desc->AddString('LastIpAddress'); 78 $Column->HasDefault = true; 79 $Column->Nullable = true; 80 $Column = $Desc->AddDateTime('LastLoginTime'); 81 $Column->Nullable = true; 82 $Column->HasDefault = true; 79 83 $Desc->AddDateTime('RegistrationTime'); 80 84 $Desc->AddBoolean('Locked'); 81 $Desc->AddString('InitPassword'); 85 $Column = $Desc->AddString('InitPassword'); 86 $Column->Nullable = true; 87 $Column->HasDefault = true; 82 88 return $Desc; 83 89 } … … 118 124 if ($Row['User'] != '') 119 125 { 120 $Query = $this->Database->query('SELECT `User`.*, `UserCustomerRel`.`Customer` AS `Member` FROM `User` '. 121 ' LEFT JOIN `UserCustomerRel` ON `UserCustomerRel`.`User`=`User`.`Id` WHERE `User`.`Id`='.$Row['User']); 126 $Query = $this->Database->query('SELECT `User`.* FROM `User` WHERE `User`.`Id`='.$Row['User']); 122 127 $this->User = $Query->fetch_assoc(); 123 128 $Result = USER_LOGGED; … … 500 505 { 501 506 $Desc = new ModelDesc(self::GetClassName()); 502 $Desc->AddReference('Module', Module::GetClassName());507 //$Desc->AddReference('Module', Module::GetClassName()); 503 508 $Desc->AddString('Operation'); 504 509 $Desc->AddString('Item');
Note:
See TracChangeset
for help on using the changeset viewer.