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

Unban functionality in dropdown #7510

Closed
wants to merge 12 commits into from
Closed

Unban functionality in dropdown #7510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
429a545
Merge pull request #1 from publiclab/master
sssash18 Jan 17, 2020
1a1da62
Merge pull request #2 from publiclab/master
sssash18 Jan 18, 2020
8f0a21e
Merge pull request #3 from publiclab/master
sssash18 Jan 19, 2020
bcda50c
Merge pull request #4 from publiclab/master
sssash18 Jan 24, 2020
559b7c3
Merge pull request #5 from publiclab/master
sssash18 Jan 25, 2020
d10930c
Merge pull request #6 from publiclab/master
sssash18 Jan 29, 2020
937cc6d
Merge pull request #7 from publiclab/master
sssash18 Jan 31, 2020
eada602
Merge pull request #8 from publiclab/master
sssash18 Feb 4, 2020
f02ffcc
Merge pull request #9 from publiclab/master
sssash18 Feb 5, 2020
f5a8a84
Merge pull request #10 from publiclab/master
sssash18 Feb 13, 2020
14a0e6f
added unban
sssash18 Feb 16, 2020
048850a
added translations
sssash18 Feb 16, 2020
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
6 changes: 3 additions & 3 deletions app/views/users/list.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@
<li><a href="/profile/<%= user.username %>">See Full Profile</a></li>
<% if current_user && (current_user.role == "admin" || current_user.role == "moderator") %>
<% if user.status == 0 %>
<i class='fa fa-ban' style="color:#a00;"></i> <%= t('users.list.banned') %>
<% elsif user.status == 1 && user != current_user %>
<li><a data-confirm="<%= t('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= t('users.list.ban') %></a></li>
<li><a data-confirm="<%= t('users.list.are_you_sure_to_unban') %>" href="/unban/<%= user.uid %>" ><i class='fa fa-ban' style="color:#a00;"></i> <%= t('users.list.unban') %></a></li>
<% elsif user.status == 1 && user != current_user %>
<li><a data-confirm="<%= t('users.list.are_you_sure') %>" href="/ban/<%= user.uid %>" ><i class='fa fa-ban'></i> <%= t('users.list.ban') %></a></li>
<% end %>
<% end %>
</ul>
Expand Down
2 changes: 2 additions & 0 deletions config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ en:
notes_and_edits: "research notes and wiki edits"
banned: "Banned"
are_you_sure: "Are you sure? The user will no longer be able to log in or publish."
are_you_sure_to_unban: "Are you sure? The user will be eligible to log in or publish."
ban: "Ban"
unban: "Unban"
_photo:
profile_photo: "Profile photo"
drag_and_drop_image: "Drag and drop to add an image, or"
Expand Down