4 files changed, 27 insertions, 9 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 9b9d64e5..7932e28b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -31,7 +31,7 @@ class UsersController < ApplicationController
   def create
     @user = User.new user_params
 
-    if @user.save
+    if @user.save_witnessed(:actor => current_user)
       flash[:notice] = t("flash.users.created", :login => @user.login)
       redirect_to user_path(@user)
     else
diff --git a/app/helpers/node_actions_helper.rb b/app/helpers/node_actions_helper.rb
index 53f6ecd0..019a9cf7 100644
--- a/app/helpers/node_actions_helper.rb
+++ b/app/helpers/node_actions_helper.rb
@@ -19,10 +19,11 @@ module NodeActionsHelper
     "otp_enroll"         => "shield-lock",
     "otp_disable"        => "shield-off",
     "otp_reset"          => "shield-x",
+    "user_create"        => "user-plus",
     "user_deactivate"    => "user-off",
     "user_reactivate"    => "user-check",
-    "redaktion_grant"    => "user-plus",
-    "redaktion_revoke"   => "user-minus"
+    "redaktion_grant"    => "users-plus",
+    "redaktion_revoke"   => "users-minus"
   }.freeze
 
   def verb_icon action
@@ -295,4 +296,9 @@ module NodeActionsHelper
     t("node_actions.redaktion_revoke", :actor => actor_ref(action),
        :target => user_participant_ref(action)).html_safe
   end
+
+  def summarize_user_create action
+    t("node_actions.user_create", :actor => actor_ref(action),
+       :target => user_participant_ref(action)).html_safe
+  end
 end
diff --git a/app/models/node_action.rb b/app/models/node_action.rb
index d619aac5..82a3ef44 100644
--- a/app/models/node_action.rb
+++ b/app/models/node_action.rb
@@ -98,12 +98,13 @@ class NodeAction < ApplicationRecord
   #   "detached_from"         -- array of unique_names, only when any
   #   "headline_removed_from" -- array of unique_names, only when any
   #
-  # "otp_enroll" / "otp_disable" / "otp_reset" / "user_deactivate" /
-  # "user_reactivate" (second-factor lifecycle; node column nil;
-  # participants: the affected User
-  # User-typed subject. otp_disable is self-service; otp_reset is an
-  # administrator clearing someone else's factor, where actor and
-  # participant differ):
+  # "otp_enroll" / "otp_disable" / "otp_reset" (second-factor
+  # lifecycle) and "user_create" / "user_deactivate" /
+  # "user_reactivate" (account lifecycle). Node column nil;
+  # participants: the affected User, a User-typed subject.
+  # otp_disable is self-service; otp_reset and all three account
+  # verbs are an administrator acting on someone else, so actor and
+  # participant differ:
   #   "target_login" -- flat string, the affected account's login
   #
   # Reserved: "demote" (via "trash" | "depublish") for an explicit
diff --git a/app/models/user.rb b/app/models/user.rb
index 4b70ebe5..49c22584 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -117,6 +117,17 @@ class User < ApplicationRecord
     redaktion?
   end
 
+  def save_witnessed(actor:)
+    saved = false
+    transaction do
+      saved = save
+      raise ActiveRecord::Rollback unless saved
+      NodeAction.record!(:participants => [self], :user => actor,
+                          :action => "user_create", :target_login => login)
+    end
+    saved
+  end
+
   def deactivate!(actor:)
     return false if alumni?
     transaction do