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

Add option to delete moderation notes #10529

Merged
merged 6 commits into from May 1, 2020
Merged

Add option to delete moderation notes #10529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5036e99
add checkbox
blutarch Apr 27, 2020
5ea9d76
add checkbox to deleteconfirm modal
blutarch Apr 29, 2020
fcec876
add checkbox value to form
blutarch Apr 30, 2020
7da3289
change key name and string code
blutarch Apr 30, 2020
dd24600
cange mod to moderation
blutarch Apr 30, 2020
abfc266
simplify getting form value
blutarch Apr 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion applications/dashboard/controllers/class.usercontroller.php
View file
Open in desktop
Expand Up @@ -550,7 +550,10 @@ public function delete($userID = '', $method = '') {
}

if ($this->Form->authenticatedPostBack(true) && $method != '') {
$userModel->deleteID($userID, ['DeleteMethod' => $method]);
$userModel->deleteID(
$userID,
['DeleteMethod' => $method, 'DeleteModerationInfo' => $this->Form->getFormValue('DeleteModerationInfo')]
);
$this->View = 'deletecomplete';
}

Expand Down
1 change: 0 additions & 1 deletion applications/dashboard/views/user/delete.php
View file
Open in desktop
Expand Up @@ -18,5 +18,4 @@
<div class="label-wrap-wide"><?php echo t('UserDeleteMessage', "Delete the user and completely remove all of the user's content. This may cause discussions to be disjointed. Best option for removing spam."); ?></div>
<div class="input-wrap-right"><?php echo anchor(t('UserDelete', 'Delete User Content'), 'user/delete/'.$this->User->UserID.'/delete', 'btn btn-secondary js-modal', ['data-css-class' => 'modal-sm']); ?></div>
</div>

<?php } ?>
3 changes: 2 additions & 1 deletion applications/dashboard/views/user/deleteconfirm.php
View file
Open in desktop
Expand Up @@ -15,7 +15,8 @@
else if ($this->Method == 'wipe')
echo t("All of the user content will be replaced with a message stating the user has been deleted.");
else
echo t("The user content will be completely deleted.");
echo t("The user content will be completely deleted."),
$this->Form->checkBox('DeleteModerationInfo', t('Delete moderation information'), ['value' => '1']);
?>
</div>
<?php
Expand Down