diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-11-15 11:00:25 +0100 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-11-27 19:40:51 +0100 |
commit | 608624252466acf9f1d9ee1c1170bd4fe4d18d18 (patch) | |
tree | 47eab55bb5421b7fe88e0b2ac743a436fd9561cf /client/src/app/+admin | |
parent | 51548b31815c6f96f314ae96588a9adca150519d (diff) | |
download | PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.gz PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.tar.zst PeerTube-608624252466acf9f1d9ee1c1170bd4fe4d18d18.zip |
Rename Pod -> Server
Diffstat (limited to 'client/src/app/+admin')
6 files changed, 13 insertions, 20 deletions
diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.ts b/client/src/app/+admin/follows/followers-list/followers-list.component.ts index 208a0c648..8dc2d9317 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.ts +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.ts | |||
@@ -1,11 +1,9 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component } from '@angular/core' |
2 | 2 | ||
3 | import { NotificationsService } from 'angular2-notifications' | 3 | import { NotificationsService } from 'angular2-notifications' |
4 | import { SortMeta } from 'primeng/primeng' | 4 | import { SortMeta } from 'primeng/primeng' |
5 | 5 | import { AccountFollow } from '../../../../../../shared/models/accounts/follow.model' | |
6 | import { ConfirmService } from '../../../core' | 6 | import { RestPagination, RestTable } from '../../../shared' |
7 | import { RestTable, RestPagination } from '../../../shared' | ||
8 | import { Pod } from '../../../../../../shared' | ||
9 | import { FollowService } from '../shared' | 7 | import { FollowService } from '../shared' |
10 | 8 | ||
11 | @Component({ | 9 | @Component({ |
@@ -14,7 +12,7 @@ import { FollowService } from '../shared' | |||
14 | styleUrls: [ './followers-list.component.scss' ] | 12 | styleUrls: [ './followers-list.component.scss' ] |
15 | }) | 13 | }) |
16 | export class FollowersListComponent extends RestTable { | 14 | export class FollowersListComponent extends RestTable { |
17 | followers: Pod[] = [] | 15 | followers: AccountFollow[] = [] |
18 | totalRecords = 0 | 16 | totalRecords = 0 |
19 | rowsPerPage = 10 | 17 | rowsPerPage = 10 |
20 | sort: SortMeta = { field: 'createdAt', order: 1 } | 18 | sort: SortMeta = { field: 'createdAt', order: 1 } |
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.html b/client/src/app/+admin/follows/following-add/following-add.component.html index 111f6a8de..8e7dddc11 100644 --- a/client/src/app/+admin/follows/following-add/following-add.component.html +++ b/client/src/app/+admin/follows/following-add/following-add.component.html | |||
@@ -26,7 +26,7 @@ | |||
26 | </div> | 26 | </div> |
27 | 27 | ||
28 | <div *ngIf="canMakeFriends() === false" class="alert alert-warning"> | 28 | <div *ngIf="canMakeFriends() === false" class="alert alert-warning"> |
29 | It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to follow servers. | 29 | It seems that you are not on a HTTPS server. Your webserver need to have TLS activated in order to follow servers. |
30 | </div> | 30 | </div> |
31 | 31 | ||
32 | <input type="submit" value="Add following" class="btn btn-default" [disabled]="!isFormValid()"> | 32 | <input type="submit" value="Add following" class="btn btn-default" [disabled]="!isFormValid()"> |
diff --git a/client/src/app/+admin/follows/following-add/following-add.component.ts b/client/src/app/+admin/follows/following-add/following-add.component.ts index d95d6afa9..0ceb4c1db 100644 --- a/client/src/app/+admin/follows/following-add/following-add.component.ts +++ b/client/src/app/+admin/follows/following-add/following-add.component.ts | |||
@@ -94,8 +94,6 @@ export class FollowingAddComponent implements OnInit { | |||
94 | this.followService.follow(notEmptyHosts).subscribe( | 94 | this.followService.follow(notEmptyHosts).subscribe( |
95 | status => { | 95 | status => { |
96 | this.notificationsService.success('Success', 'Follow request(s) sent!') | 96 | this.notificationsService.success('Success', 'Follow request(s) sent!') |
97 | // Wait requests between pods | ||
98 | setTimeout(() => this.router.navigate([ '/admin/friends/list' ]), 1000) | ||
99 | }, | 97 | }, |
100 | 98 | ||
101 | err => this.notificationsService.error('Error', err.message) | 99 | err => this.notificationsService.error('Error', err.message) |
diff --git a/client/src/app/+admin/follows/following-list/following-list.component.ts b/client/src/app/+admin/follows/following-list/following-list.component.ts index 7d2c5084b..a1dff1db3 100644 --- a/client/src/app/+admin/follows/following-list/following-list.component.ts +++ b/client/src/app/+admin/follows/following-list/following-list.component.ts | |||
@@ -1,11 +1,8 @@ | |||
1 | import { Component, OnInit } from '@angular/core' | 1 | import { Component } from '@angular/core' |
2 | |||
3 | import { NotificationsService } from 'angular2-notifications' | 2 | import { NotificationsService } from 'angular2-notifications' |
4 | import { SortMeta } from 'primeng/primeng' | 3 | import { SortMeta } from 'primeng/primeng' |
5 | 4 | import { AccountFollow } from '../../../../../../shared/models/accounts/follow.model' | |
6 | import { ConfirmService } from '../../../core' | 5 | import { RestPagination, RestTable } from '../../../shared' |
7 | import { RestTable, RestPagination } from '../../../shared' | ||
8 | import { Pod } from '../../../../../../shared' | ||
9 | import { FollowService } from '../shared' | 6 | import { FollowService } from '../shared' |
10 | 7 | ||
11 | @Component({ | 8 | @Component({ |
@@ -13,7 +10,7 @@ import { FollowService } from '../shared' | |||
13 | templateUrl: './following-list.component.html' | 10 | templateUrl: './following-list.component.html' |
14 | }) | 11 | }) |
15 | export class FollowingListComponent extends RestTable { | 12 | export class FollowingListComponent extends RestTable { |
16 | following: Pod[] = [] | 13 | following: AccountFollow[] = [] |
17 | totalRecords = 0 | 14 | totalRecords = 0 |
18 | rowsPerPage = 10 | 15 | rowsPerPage = 10 |
19 | sort: SortMeta = { field: 'createdAt', order: 1 } | 16 | sort: SortMeta = { field: 'createdAt', order: 1 } |
diff --git a/client/src/app/+admin/follows/shared/follow.service.ts b/client/src/app/+admin/follows/shared/follow.service.ts index 622c33cea..3dc91dfca 100644 --- a/client/src/app/+admin/follows/shared/follow.service.ts +++ b/client/src/app/+admin/follows/shared/follow.service.ts | |||
@@ -7,7 +7,7 @@ import 'rxjs/add/operator/map' | |||
7 | import { SortMeta } from 'primeng/primeng' | 7 | import { SortMeta } from 'primeng/primeng' |
8 | 8 | ||
9 | import { RestExtractor, RestPagination, RestService } from '../../../shared' | 9 | import { RestExtractor, RestPagination, RestService } from '../../../shared' |
10 | import { Pod, ResultList } from '../../../../../../shared' | 10 | import { AccountFollow, ResultList } from '../../../../../../shared' |
11 | 11 | ||
12 | @Injectable() | 12 | @Injectable() |
13 | export class FollowService { | 13 | export class FollowService { |
@@ -19,7 +19,7 @@ export class FollowService { | |||
19 | private restExtractor: RestExtractor | 19 | private restExtractor: RestExtractor |
20 | ) {} | 20 | ) {} |
21 | 21 | ||
22 | getFollowing (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> { | 22 | getFollowing (pagination: RestPagination, sort: SortMeta): Observable<ResultList<AccountFollow>> { |
23 | let params = new HttpParams() | 23 | let params = new HttpParams() |
24 | params = this.restService.addRestGetParams(params, pagination, sort) | 24 | params = this.restService.addRestGetParams(params, pagination, sort) |
25 | 25 | ||
@@ -28,7 +28,7 @@ export class FollowService { | |||
28 | .catch(res => this.restExtractor.handleError(res)) | 28 | .catch(res => this.restExtractor.handleError(res)) |
29 | } | 29 | } |
30 | 30 | ||
31 | getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<Pod>> { | 31 | getFollowers (pagination: RestPagination, sort: SortMeta): Observable<ResultList<AccountFollow>> { |
32 | let params = new HttpParams() | 32 | let params = new HttpParams() |
33 | params = this.restService.addRestGetParams(params, pagination, sort) | 33 | params = this.restService.addRestGetParams(params, pagination, sort) |
34 | 34 | ||
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html index e73f38112..1d8bb4d38 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html | |||
@@ -9,7 +9,7 @@ | |||
9 | > | 9 | > |
10 | <p-column field="id" header="ID" [sortable]="true"></p-column> | 10 | <p-column field="id" header="ID" [sortable]="true"></p-column> |
11 | <p-column field="reason" header="Reason"></p-column> | 11 | <p-column field="reason" header="Reason"></p-column> |
12 | <p-column field="reporterPodHost" header="Reporter pod host"></p-column> | 12 | <p-column field="reporterServerHost" header="Reporter server host"></p-column> |
13 | <p-column field="reporterUsername" header="Reporter username"></p-column> | 13 | <p-column field="reporterUsername" header="Reporter username"></p-column> |
14 | <p-column header="Video" styleClass="action-cell"> | 14 | <p-column header="Video" styleClass="action-cell"> |
15 | <ng-template pTemplate="body" let-videoAbuse="rowData"> | 15 | <ng-template pTemplate="body" let-videoAbuse="rowData"> |