Development

Changeset 24381

You must first sign up to be able to contribute.

Changeset 24381

Show
Ignore:
Timestamp:
11/25/09 15:02:11 (3 years ago)
Author:
ornicar2
Message:

[Diem] Added task user to event log
- added user icon to sprite 24

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmLog/lib/dmEventLogView.php

    r24169 r24381  
    5151    switch($action) 
    5252    { 
    53       case 'create': $class = 's24 s24_add'; break; 
    54       case 'update': $class = 's24 s24_edit'; break; 
    55       case 'delete': $class = 's24 s24_delete'; break; 
    56       case 'error':  $class = 's24 s24_error'; break; 
    57       case 'clear':  $class = 's24 s24_info'; break; 
    58       default:       $class = ''; 
     53      case 'create':    $class = 's24 s24_add'; break; 
     54      case 'update':    $class = 's24 s24_edit'; break; 
     55      case 'delete':    $class = 's24 s24_delete'; break; 
     56      case 'error':     $class = 's24 s24_error'; break; 
     57      case 'clear':     $class = 's24 s24_info'; break; 
     58      case 'sign_in': 
     59      case 'sign_out':  $class = 's24 s24_user'; break; 
     60      default:          $class = ''; 
    5961    } 
    6062     

  • plugins/diemPlugin/trunk/dmCorePlugin/lib/log/event/dmEventLogEntry.php

    r24194 r24381  
    88  public function configure(array $data) 
    99  { 
     10    $userId = dmArray::get($data, 'user_id', $this->serviceContainer->getService('user')->getUserId()); 
     11     
     12    if (!$userId && dmConfig::isCli()) 
     13    { 
     14      $userId = 'task'; 
     15    } 
     16     
    1017    $this->data = array( 
    1118      'time'          => (string) $data['server']['REQUEST_TIME'], 
    1219      'ip'            => (string) isset($data['server']['REMOTE_ADDR']) ? $data['server']['REMOTE_ADDR'] : '-', 
    1320      'session_id'    => (string) session_id(), 
    14       'user_id'       => (string) dmArray::get($data, 'user_id', $this->serviceContainer->getService('user')->getUserId()), 
     21      'user_id'       => (string) $userId, 
    1522      'action'        => (string) $data['action'], 
    1623      'type'          => (string) $data['type'], 
    …… 
    2835    $userId = $this->get('user_id'); 
    2936     
    30     if(!isset(self::$usersCache[$userId])) 
     37    if($userId && is_numeric($userId)) 
    3138    { 
    32       self::$usersCache[$userId] = $userId ? dmDb::query('DmUser u')->where('u.id = ?', $userId)->fetchRecord() : null; 
     39      if (!isset(self::$usersCache[$userId])) 
     40      { 
     41        self::$usersCache[$userId] = $userId ? dmDb::query('DmUser u')->where('u.id = ?', $userId)->fetchRecord() : null; 
     42      } 
     43       
     44      return self::$usersCache[$userId]; 
    3345    } 
    3446     
    35     return self::$usersCache[$userId]; 
     47    return null; 
    3648  } 
    3749   
    …… 
    3951  protected function getUsername() 
    4052  { 
    41     return ($user = $this->getUser()) ? $user->get('username') : null; 
     53    return ($user = $this->getUser()) 
     54    ? $user->get('username') 
     55    : ('task' === $this->get('user_id') 
     56      ? 'task' 
     57      : ''); 
    4258  } 
    4359   

  • plugins/diemPlugin/trunk/dmCorePlugin/web/css/sprite24.css

    r23277 r24381  
    99.s24_edit{background-position:0 -192px;} 
    1010.s24_error{background-position:0 -216px;} 
     11.s24_user{background-position:0 -240px;}