From f0d43b1d30086ffdc46dae0157ec0da96b64897a Mon Sep 17 00:00:00 2001
From: Marc Zacho <marc.zacho@lego.com>
Date: Mon, 19 Feb 2024 14:49:00 +0100
Subject: [PATCH 1/4] Added Last Login to user/profile GUI and user api output

---
 netbox/templates/account/profile.html | 4 ++++
 netbox/templates/users/user.html      | 4 ++++
 netbox/users/api/serializers.py       | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html
index cb699072c09..40d7478922f 100644
--- a/netbox/templates/account/profile.html
+++ b/netbox/templates/account/profile.html
@@ -34,6 +34,10 @@ <h5 class="card-header">{% trans "Account Details" %}</h5>
               <th scope="row">{% trans "Account Created" %}</th>
               <td>{{ request.user.date_joined|annotated_date }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Account Last Login" %}</th>
+              <td>{{ object.last_login|annotated_date }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "Superuser" %}</th>
               <td>{% checkmark request.user.is_superuser %}</td>
diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html
index 18c07c1ccf1..51ee49bb287 100644
--- a/netbox/templates/users/user.html
+++ b/netbox/templates/users/user.html
@@ -30,6 +30,10 @@ <h5 class="card-header">{% trans "User" %}</h5>
               <th scope="row">{% trans "Account Created" %}</th>
               <td>{{ object.date_joined|annotated_date }}</td>
             </tr>
+            <tr>
+              <th scope="row">{% trans "Account Last Login" %}</th>
+              <td>{{ object.last_login|annotated_date }}</td>
+            </tr>
             <tr>
               <th scope="row">{% trans "Active" %}</th>
               <td>{% checkmark object.is_active %}</td>
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index c9775e39a5e..0a397d06fc8 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -35,7 +35,7 @@ class Meta:
         model = get_user_model()
         fields = (
             'id', 'url', 'display', 'username', 'password', 'first_name', 'last_name', 'email', 'is_staff', 'is_active',
-            'date_joined', 'groups',
+            'date_joined', 'last_login', 'groups',
         )
         extra_kwargs = {
             'password': {'write_only': True}

From bcb2abefc9bc4651e76df8f25bea908644970a7c Mon Sep 17 00:00:00 2001
From: Zacho <zacho112@gmail.com>
Date: Tue, 20 Feb 2024 20:36:15 +0100
Subject: [PATCH 2/4] Update netbox/templates/account/profile.html

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
---
 netbox/templates/account/profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html
index 40d7478922f..5e3be6e9415 100644
--- a/netbox/templates/account/profile.html
+++ b/netbox/templates/account/profile.html
@@ -36,7 +36,7 @@ <h5 class="card-header">{% trans "Account Details" %}</h5>
             </tr>
             <tr>
               <th scope="row">{% trans "Account Last Login" %}</th>
-              <td>{{ object.last_login|annotated_date }}</td>
+              <td>{{ request.user.last_login|annotated_date }}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "Superuser" %}</th>

From a628503485c64ba45c14a21b25bc80d707754de5 Mon Sep 17 00:00:00 2001
From: Zacho <zacho112@gmail.com>
Date: Tue, 20 Feb 2024 20:36:20 +0100
Subject: [PATCH 3/4] Update netbox/templates/account/profile.html

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
---
 netbox/templates/account/profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html
index 5e3be6e9415..88e048f2f04 100644
--- a/netbox/templates/account/profile.html
+++ b/netbox/templates/account/profile.html
@@ -35,7 +35,7 @@ <h5 class="card-header">{% trans "Account Details" %}</h5>
               <td>{{ request.user.date_joined|annotated_date }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Account Last Login" %}</th>
+              <th scope="row">{% trans "Last Login" %}</th>
               <td>{{ request.user.last_login|annotated_date }}</td>
             </tr>
             <tr>

From e718773c9e7fd41960fd59034e7bb96eda5a4610 Mon Sep 17 00:00:00 2001
From: Zacho <zacho112@gmail.com>
Date: Tue, 20 Feb 2024 20:36:25 +0100
Subject: [PATCH 4/4] Update netbox/templates/users/user.html

Co-authored-by: Jeremy Stretch <jstretch@netboxlabs.com>
---
 netbox/templates/users/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html
index 51ee49bb287..a4d20131e32 100644
--- a/netbox/templates/users/user.html
+++ b/netbox/templates/users/user.html
@@ -31,7 +31,7 @@ <h5 class="card-header">{% trans "User" %}</h5>
               <td>{{ object.date_joined|annotated_date }}</td>
             </tr>
             <tr>
-              <th scope="row">{% trans "Account Last Login" %}</th>
+              <th scope="row">{% trans "Last Login" %}</th>
               <td>{{ object.last_login|annotated_date }}</td>
             </tr>
             <tr>