Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

User soft deletion #7537

Closed
wants to merge 4 commits into from
Closed

User soft deletion #7537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5874c3
Remove functionality to delete user from webUI
parlt91 Sep 13, 2023
c785f98
Deprecate API function to delete user and call deactivate instead
parlt91 Sep 13, 2023
6ba32b4
Deprecate spacecmd function to delete user and call deactivate instead
parlt91 Sep 13, 2023
30d9248
testsuite changes
parlt91 Sep 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 0 additions & 107 deletions java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserAction.java
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions java/code/src/com/redhat/rhn/frontend/action/user/DeleteUserSetupAction.java
View file
Open in desktop

This file was deleted.

127 changes: 0 additions & 127 deletions java/code/src/com/redhat/rhn/frontend/action/user/test/DeleteUserActionTest.java
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,13 +1076,6 @@
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
</trans-unit>
<trans-unit id="user.delete" xml:space="preserve">
<source>Deleted user &lt;strong&gt;{0}&lt;/strong&gt;.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DeleteUser</context>
<context context-type="paramnotes">Deleted user ssprocket.</context>
</context-group>
</trans-unit>
<trans-unit id="user.disable" xml:space="preserve">
<source>Deactivated user &lt;strong&gt;{0}&lt;/strong&gt;.</source>
<context-group name="ctx">
Expand All @@ -1109,12 +1102,6 @@
<context context-type="paramnotes">Deactivated user ssprocket.</context>
</context-group>
</trans-unit>
<trans-unit id="user.deleteself" xml:space="preserve">
<source>You may not delete yourself.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
</trans-unit>
<trans-unit id="user.satadmin.remove" xml:space="preserve">
<source>Removed @@PRODUCT_NAME@@ Administrator role from {0}</source>
<context-group name="ctx">
Expand All @@ -1127,18 +1114,6 @@
<context context-type="sourcefile">/rhn/admin/multiorg/Users</context>
</context-group>
</trans-unit>
<trans-unit id="user.deleteadmin" xml:space="preserve">
<source>You cannot delete another organization administrator. Please remove the 'Organization Administrator' role from this user before attempting to delete their account</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/CreateUser</context>
</context-group>
</trans-unit>
<trans-unit id="user.cannot.delete.last.sat.admin" xml:space="preserve">
<source>Cannot delete the last remaining @@PRODUCT_NAME@@ administrator.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/users/DeleteUser</context>
</context-group>
</trans-unit>
<trans-unit id="Users" xml:space="preserve">
<source>Users</source>
<context-group name="ctx">
Expand Down
12 changes: 0 additions & 12 deletions java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,6 @@
</context-group>
<note>NO TRANSLATION NECSSARY</note>
</trans-unit>
<trans-unit id="permission.jsp.title.deleteuser">
<source>Cannot delete user.</source>
<context-group name="ctx">
<context context-type="sourcefile">Permission error page</context>
</context-group>
</trans-unit>
<trans-unit id="permission.jsp.title.channel">
<source>Cannot edit channel.</source>
<context-group name="ctx">
Expand Down Expand Up @@ -752,12 +746,6 @@
<context context-type="sourcefile">Permission error page</context>
</context-group>
</trans-unit>
<trans-unit id="permission.jsp.summary.deleteuser">
<source>You must be an organization administrator for a @@PRODUCT_NAME@@ to delete a user.</source>
<context-group name="ctx">
<context context-type="sourcefile">Permission error page</context>
</context-group>
</trans-unit>
<trans-unit id="permission.jsp.summary.disableuser">
<source>You must be an organization administrator to deactivate a user.</source>
<context-group name="ctx">
Expand Down
Loading
Loading