diff --git a/core/modules/user/lib/Drupal/user/Entity/User.php b/core/modules/user/lib/Drupal/user/Entity/User.php index 22d98ac..56f9907 100644 --- a/core/modules/user/lib/Drupal/user/Entity/User.php +++ b/core/modules/user/lib/Drupal/user/Entity/User.php @@ -114,9 +114,6 @@ public function preSave(EntityStorageInterface $storage) { \Drupal::service('user.data')->set('user', $this->id(), substr($key, 5), $this->{$key}); } } - - // Before saving the user, set changed time. - $this->changed->value = REQUEST_TIME; } /** @@ -448,13 +445,6 @@ public function setUsername($username) { /** * {@inheritdoc} */ - public function getChangedTime() { - return $this->get('changed')->value; - } - - /** - * {@inheritdoc} - */ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { $fields['uid'] = FieldDefinition::create('integer') ->setLabel(t('User ID')) @@ -539,9 +529,9 @@ public static function baseFieldDefinitions(EntityTypeInterface $entity_type) { ->setDescription(t('The email address used for initial account creation.')) ->setSetting('default_value', ''); - $fields['changed'] = FieldDefinition::create('changed') - ->setLabel(t('Changed')) - ->setDescription(t('The time the user was most recently saved.')); + $fields['changed'] = FieldDefinition::create('changed') + ->setLabel(t('Changed')) + ->setDescription(t('The time that the user was last edited.')); // @todo Convert this to entity_reference_field, see // https://drupal.org/node/2044859. diff --git a/core/modules/user/lib/Drupal/user/UserInterface.php b/core/modules/user/lib/Drupal/user/UserInterface.php index 68c2974..ae4caaf 100644 --- a/core/modules/user/lib/Drupal/user/UserInterface.php +++ b/core/modules/user/lib/Drupal/user/UserInterface.php @@ -7,13 +7,14 @@ namespace Drupal\user; +use Drupal\Core\Entity\EntityChangedInterface; use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Session\AccountInterface; /** * Provides an interface defining a user entity. */ -interface UserInterface extends ContentEntityInterface, AccountInterface { +interface UserInterface extends ContentEntityInterface, EntityChangedInterface, AccountInterface { /** * Whether a user has a certain role. @@ -179,11 +180,4 @@ public function block(); */ public function getInitialEmail(); - /** - * Returns the user modification timestamp. - * - * @return int - * User modification timestamp. - */ - public function getChangedTime(); } diff --git a/core/modules/user/user.views.inc b/core/modules/user/user.views.inc index 44c1cb3..a1b9f58 100644 --- a/core/modules/user/user.views.inc +++ b/core/modules/user/user.views.inc @@ -267,6 +267,74 @@ function user_views_data() { ), ); + $data['users']['changed'] = array( + 'title' => t('Updated date'), + 'help' => t('The date the user was last updated.'), + 'field' => array( + 'id' => 'date', + ), + 'sort' => array( + 'id' => 'date' + ), + 'filter' => array( + 'id' => 'date', + ), + ); + + $data['users']['changed_fulldate'] = array( + 'title' => t('Updated date'), + 'help' => t('Date in the form of CCYYMMDD.'), + 'argument' => array( + 'field' => 'changed', + 'id' => 'date_fulldate', + ), + ); + + $data['users']['changed_year_month'] = array( + 'title' => t('Updated year + month'), + 'help' => t('Date in the form of YYYYMM.'), + 'argument' => array( + 'field' => 'changed', + 'id' => 'date_year_month', + ), + ); + + $data['users']['changed_year'] = array( + 'title' => t('Updated year'), + 'help' => t('Date in the form of YYYY.'), + 'argument' => array( + 'field' => 'changed', + 'id' => 'date_year', + ), + ); + + $data['users']['changed_month'] = array( + 'title' => t('Updated month'), + 'help' => t('Date in the form of MM (01 - 12).'), + 'argument' => array( + 'field' => 'changed', + 'id' => 'date_month', + ), + ); + + $data['users']['changed_day'] = array( + 'title' => t('Updated day'), + 'help' => t('Date in the form of DD (01 - 31).'), + 'argument' => array( + 'field' => 'changed', + 'id' => 'date_day', + ), + ); + + $data['users']['changed_week'] = array( + 'title' => t('Updated week'), + 'help' => t('Date in the form of WW (01 - 53).'), + 'argument' => array( + 'field' => 'changed', + 'id' => 'date_week', + ), + ); + if (\Drupal::moduleHandler()->moduleExists('filter')) { $data['users']['signature'] = array( 'title' => t('Signature'),