[limb-svn] r6498 - in 3.x/trunk/limb/cms: src/model template/_cms

[svn at limb-project.com]

Author: wiliam
Date: 2007-11-07 16:36:13 +0300 (Wed, 07 Nov 2007)
New Revision: 6498
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6498

Modified:
   3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php
   3.x/trunk/limb/cms/template/_cms/user_data.html
Log:
-- template typo fixed (due to previous db structure changes - cms_user doesn't have last_name, first_name fields)

Modified: 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php
===================================================================
--- 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php	2007-11-07 13:27:32 UTC (rev 6497)
+++ 3.x/trunk/limb/cms/src/model/lmbCmsUser.class.php	2007-11-07 13:36:13 UTC (rev 6498)
@@ -25,8 +25,7 @@
   protected function _createValidator()
   {
     $validator = new lmbValidator();
-    $validator->addRequiredRule('first_name');
-    $validator->addRequiredRule('last_name');
+    $validator->addRequiredRule('name');
     $validator->addRequiredRule('login');
     $validator->addRequiredRule('email');
 
@@ -92,11 +91,6 @@
     $this->is_logged_in = $logged_in;
   }
 
-  function getFullName()
-  {
-    return $this->getLastName() . ' ' . $this->getFirstName() . ' ' . $this->getMiddleName();
-  }
-
   function cryptPassword($password)
   {
     return md5($password);

Modified: 3.x/trunk/limb/cms/template/_cms/user_data.html
===================================================================
--- 3.x/trunk/limb/cms/template/_cms/user_data.html	2007-11-07 13:27:32 UTC (rev 6497)
+++ 3.x/trunk/limb/cms/template/_cms/user_data.html	2007-11-07 13:36:13 UTC (rev 6498)
@@ -1,5 +1,5 @@
 <core:datasource from='#toolkit.cms_user'>
 <div id='user_data'>
-  <span class='name'>{$login} [ {$full_name} ]</span> <a href="/admin_user/detail/{$id}" class='profile'>Мой профиль</a> <a href='/user/logout' class='logout'>Выйти</a>
+  <span class='name'>{$login} [ {$name} ]</span> <a href="/admin_user/detail/{$id}" class='profile'>Мой профиль</a> <a href='/user/logout' class='logout'>Выйти</a>
 </div>
 </core:datasource>