Chocobozzz/PeerTube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2024-09-11 21:47:09 +03:00
Code Issues Projects Releases Wiki Activity

Update a little bit user dropdown message

Browse Source
This commit is contained in:
Chocobozzz 2020-01-21 14:05:22 +01:00
parent 7c1f3e7366
commit f0ad471007
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app/+admin/users/user-list/user-list.component.ts
View File

@ -63,7 +63,7 @@ export class UserListComponent extends RestTable implements OnInit {
},
{
label: this.i18n('Ban'),
description: this.i18n('Videos will be kept as private, comments will be kept as is.'),
description: this.i18n('User won\'t be able to login anymore, but videos and comments will be kept as is.'),
handler: users => this.openBanUserModal(users),
isDisplayed: users => users.every(u => this.authUser.canManage(u) && u.blocked === false)
},

1
client/src/app/shared/buttons/action-dropdown.component.html
View File

@ -17,6 +17,7 @@
<ng-template #templateActionLabel let-action>
<my-global-icon *ngIf="action.iconName" [iconName]="action.iconName" [ngClass]="'icon-' + action.iconName"></my-global-icon>
<div class="d-flex flex-column">
<span i18n>{{ action.label }}</span>
<small class="text-muted" *ngIf="action.description">{{ action.description }}</small>

6
client/src/app/shared/moderation/user-moderation-dropdown.component.ts
View File

@ -243,18 +243,18 @@ export class UserModerationDropdownComponent implements OnInit, OnChanges {
if (this.user && authUser.hasRight(UserRight.MANAGE_USERS) && authUser.canManage(this.user)) {
this.userActions.push([
{
label: this.i18n('Edit'),
label: this.i18n('Edit user'),
description: this.i18n('Change quota, role, and more.'),
linkBuilder: ({ user }) => this.getRouterUserEditLink(user)
},
{
label: this.i18n('Delete'),
label: this.i18n('Delete user'),
description: this.i18n('Videos will be deleted, comments will be tombstoned.'),
handler: ({ user }) => this.removeUser(user)
},
{
label: this.i18n('Ban'),
description: this.i18n('Videos will be kept as private, comments will be kept as is.'),
description: this.i18n('User won\'t be able to login anymore, but videos and comments will be kept as is.'),
handler: ({ user }) => this.openBanUserModal(user),
isDisplayed: ({ user }) => !user.blocked
},

1
client/src/app/shared/user-subscription/remote-subscribe.component.ts
View File

@ -39,6 +39,7 @@ export class RemoteSubscribeComponent extends FormReactive implements OnInit {
const address = this.form.value['text']
const [ username, hostname ] = address.split('@')
// Should not have CORS error because https://tools.ietf.org/html/rfc7033#section-5
fetch(`https://${hostname}/.well-known/webfinger?resource=acct:${username}@${hostname}`)
.then(response => response.json())
.then(data => new Promise((resolve, reject) => {

2
server/initializers/database.ts
View File

@ -163,7 +163,7 @@ async function checkPostgresExtension (extension: string) {
}
}
async function createFunctions () {
function createFunctions () {
const query = `CREATE OR REPLACE FUNCTION immutable_unaccent(text)
RETURNS text AS
$func$