Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
peertube
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
flint media
peertube
Commits
dffd5d12
Commit
dffd5d12
authored
Oct 15, 2018
by
BO41
Committed by
Rigel Kent
Oct 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update tslint config and fix member ordering (#1279)
parent
4fe98be6
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
36 deletions
+42
-36
user-edit.ts
client/src/app/+admin/users/user-edit/user-edit.ts
+0
-1
user-list.component.ts
client/src/app/+admin/users/user-list/user-list.component.ts
+14
-14
my-account-ownership.component.ts
...nt/my-account-ownership/my-account-ownership.component.ts
+12
-12
search.component.ts
client/src/app/search/search.component.ts
+1
-2
rest-table.ts
client/src/app/shared/rest/rest-table.ts
+2
-2
tslint.json
client/tslint.json
+12
-4
tslint.json
tslint.json
+1
-1
No files found.
client/src/app/+admin/users/user-edit/user-edit.ts
View file @
dffd5d12
import
{
ServerService
}
from
'../../../core'
import
{
FormReactive
}
from
'../../../shared'
import
{
USER_ROLE_LABELS
,
VideoResolution
}
from
'../../../../../../shared'
import
{
EditCustomConfigComponent
}
from
'../../../+admin/config/edit-custom-config/'
import
{
ConfigService
}
from
'@app/+admin/config/shared/config.service'
export
abstract
class
UserEdit
extends
FormReactive
{
...
...
client/src/app/+admin/users/user-list/user-list.component.ts
View file @
dffd5d12
...
...
@@ -55,20 +55,6 @@ export class UserListComponent extends RestTable implements OnInit {
]
}
protected
loadData
()
{
this
.
selectedUsers
=
[]
this
.
userService
.
getUsers
(
this
.
pagination
,
this
.
sort
,
this
.
search
)
.
subscribe
(
resultList
=>
{
this
.
users
=
resultList
.
data
this
.
totalRecords
=
resultList
.
total
},
err
=>
this
.
notificationsService
.
error
(
this
.
i18n
(
'Error'
),
err
.
message
)
)
}
openBanUserModal
(
users
:
User
[])
{
for
(
const
user
of
users
)
{
if
(
user
.
username
===
'root'
)
{
...
...
@@ -131,4 +117,18 @@ export class UserListComponent extends RestTable implements OnInit {
isInSelectionMode
()
{
return
this
.
selectedUsers
.
length
!==
0
}
protected
loadData
()
{
this
.
selectedUsers
=
[]
this
.
userService
.
getUsers
(
this
.
pagination
,
this
.
sort
,
this
.
search
)
.
subscribe
(
resultList
=>
{
this
.
users
=
resultList
.
data
this
.
totalRecords
=
resultList
.
total
},
err
=>
this
.
notificationsService
.
error
(
this
.
i18n
(
'Error'
),
err
.
message
)
)
}
}
client/src/app/+my-account/my-account-ownership/my-account-ownership.component.ts
View file @
dffd5d12
...
...
@@ -34,18 +34,6 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
this
.
initialize
()
}
protected
loadData
()
{
return
this
.
videoOwnershipService
.
getOwnershipChanges
(
this
.
pagination
,
this
.
sort
)
.
subscribe
(
resultList
=>
{
this
.
videoChangeOwnerships
=
resultList
.
data
this
.
totalRecords
=
resultList
.
total
},
err
=>
this
.
notificationsService
.
error
(
this
.
i18n
(
'Error'
),
err
.
message
)
)
}
createByString
(
account
:
Account
)
{
return
Account
.
CREATE_BY_STRING
(
account
.
name
,
account
.
host
)
}
...
...
@@ -65,4 +53,16 @@ export class MyAccountOwnershipComponent extends RestTable implements OnInit {
err
=>
this
.
notificationsService
.
error
(
this
.
i18n
(
'Error'
),
err
.
message
)
)
}
protected
loadData
()
{
return
this
.
videoOwnershipService
.
getOwnershipChanges
(
this
.
pagination
,
this
.
sort
)
.
subscribe
(
resultList
=>
{
this
.
videoChangeOwnerships
=
resultList
.
data
this
.
totalRecords
=
resultList
.
total
},
err
=>
this
.
notificationsService
.
error
(
this
.
i18n
(
'Error'
),
err
.
message
)
)
}
}
client/src/app/search/search.component.ts
View file @
dffd5d12
import
{
Component
,
OnDestroy
,
OnInit
}
from
'@angular/core'
import
{
ActivatedRoute
,
Router
}
from
'@angular/router'
import
{
AuthService
,
RedirectService
}
from
'@app/core'
import
{
AuthService
}
from
'@app/core'
import
{
NotificationsService
}
from
'angular2-notifications'
import
{
forkJoin
,
Subscription
}
from
'rxjs'
import
{
SearchService
}
from
'@app/search/search.service'
...
...
@@ -40,7 +40,6 @@ export class SearchComponent implements OnInit, OnDestroy {
private
route
:
ActivatedRoute
,
private
router
:
Router
,
private
metaService
:
MetaService
,
private
redirectService
:
RedirectService
,
private
notificationsService
:
NotificationsService
,
private
searchService
:
SearchService
,
private
authService
:
AuthService
...
...
client/src/app/shared/rest/rest-table.ts
View file @
dffd5d12
...
...
@@ -16,8 +16,6 @@ export abstract class RestTable {
private
searchStream
:
Subject
<
string
>
private
sortLocalStorageKey
=
'rest-table-sort-'
+
this
.
constructor
.
name
protected
abstract
loadData
():
void
initialize
()
{
this
.
loadSort
()
this
.
initSearch
()
...
...
@@ -71,4 +69,6 @@ export abstract class RestTable {
onSearch
(
search
:
string
)
{
this
.
searchStream
.
next
(
search
)
}
protected
abstract
loadData
():
void
}
client/tslint.json
View file @
dffd5d12
...
...
@@ -7,10 +7,18 @@
"max-line-length"
:
[
true
,
140
],
"no-floating-promises"
:
false
,
"no-unused-variable"
:
false
,
//
Memory
issues
"member-ordering"
:
[
true
,
"public-before-private"
,
"static-before-instance"
,
"variables-before-functions"
"member-ordering"
:
[
true
,
{
"order"
:
[
"public-static-field"
,
"private-static-field"
,
"public-instance-field"
,
"private-instance-field"
,
"public-constructor"
,
"private-constructor"
,
"public-instance-method"
,
"protected-instance-method"
,
"private-instance-method"
]}
],
"angular-whitespace"
:
[
true
,
"check-interpolation"
,
"check-semicolon"
],
...
...
tslint.json
View file @
dffd5d12
...
...
@@ -4,7 +4,7 @@
"await-promise"
:
[
true
,
"Bluebird"
],
"no-inferrable-types"
:
true
,
"eofline"
:
true
,
"indent"
:
[
"spaces"
],
"indent"
:
[
true
,
"spaces"
],
"ter-indent"
:
[
true
,
2
],
"max-line-length"
:
[
true
,
140
],
"no-unused-variable"
:
false
,
//
Memory
issues
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment