Apply 15 suggestion(s) to 7 file(s)
Co-authored-by: HJ <30-hj@users.noreply.git.pleroma.social>
This commit is contained in:
parent
f5be1a4345
commit
ada0ebaed5
7 changed files with 4 additions and 21 deletions
|
|
@ -1,4 +1,3 @@
|
||||||
//import Checkbox from 'src/components/checkbox/checkbox.vue'
|
|
||||||
import SelectableList from 'src/components/selectable_list/selectable_list.vue'
|
import SelectableList from 'src/components/selectable_list/selectable_list.vue'
|
||||||
|
|
||||||
const PageList = {
|
const PageList = {
|
||||||
|
|
@ -47,7 +46,6 @@ const PageList = {
|
||||||
}).then((items) => {
|
}).then((items) => {
|
||||||
// ignore if another request was already dispatched
|
// ignore if another request was already dispatched
|
||||||
if (iter == this.gliter) {
|
if (iter == this.gliter) {
|
||||||
console.log('items', items)
|
|
||||||
this.items = [...this.items, ...items]
|
this.items = [...this.items, ...items]
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-if="boxOnly"
|
v-else
|
||||||
class="selectable-list-item-inner"
|
class="selectable-list-item-inner"
|
||||||
:class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
|
:class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
|
||||||
>
|
>
|
||||||
|
|
|
||||||
|
|
@ -16,8 +16,6 @@ const AdminCard = {
|
||||||
just_deleted: false,
|
just_deleted: false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
mounted () {
|
|
||||||
},
|
|
||||||
computed: {
|
computed: {
|
||||||
isLoaded () {
|
isLoaded () {
|
||||||
return typeof(this.user) !== 'undefined'
|
return typeof(this.user) !== 'undefined'
|
||||||
|
|
@ -73,9 +71,8 @@ const AdminCard = {
|
||||||
methods: {
|
methods: {
|
||||||
toggle_admin (v) {
|
toggle_admin (v) {
|
||||||
const u = this.$store.getters.findUser(this.userDetails.id)
|
const u = this.$store.getters.findUser(this.userDetails.id)
|
||||||
console.log('user', u)
|
|
||||||
if (v === true) {
|
if (v === true) {
|
||||||
this.$store.dispatch('adminAddUserToAdminGroup', u).then(res => console.log("res: ", res))
|
this.$store.dispatch('adminAddUserToAdminGroup', u)
|
||||||
} else {
|
} else {
|
||||||
this.$store.dispatch('adminRemoveUserFromAdminGroup', u)
|
this.$store.dispatch('adminRemoveUserFromAdminGroup', u)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
//import get from 'lodash/get'
|
|
||||||
import Checkbox from 'src/components/checkbox/checkbox.vue'
|
import Checkbox from 'src/components/checkbox/checkbox.vue'
|
||||||
import Select from 'src/components/select/select.vue'
|
import Select from 'src/components/select/select.vue'
|
||||||
import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
|
import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue'
|
||||||
|
|
@ -48,8 +47,6 @@ const UsersTab = {
|
||||||
AdminCard,
|
AdminCard,
|
||||||
TabSwitcher,
|
TabSwitcher,
|
||||||
},
|
},
|
||||||
computed: {
|
|
||||||
},
|
|
||||||
methods: {
|
methods: {
|
||||||
update_origin (v) {
|
update_origin (v) {
|
||||||
switch (v) {
|
switch (v) {
|
||||||
|
|
@ -147,7 +144,6 @@ const UsersTab = {
|
||||||
},
|
},
|
||||||
delete_selection () {
|
delete_selection () {
|
||||||
const s = this.$refs.userList.selected()
|
const s = this.$refs.userList.selected()
|
||||||
console.log(s)
|
|
||||||
s.forEach(u => this.$store.dispatch('adminDeleteUser', this.$store.getters.findUser(u.id)))
|
s.forEach(u => this.$store.dispatch('adminDeleteUser', this.$store.getters.findUser(u.id)))
|
||||||
this.reset()
|
this.reset()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@ const StatusContent = {
|
||||||
'toggleShowingLongSubject'
|
'toggleShowingLongSubject'
|
||||||
],
|
],
|
||||||
data () {
|
data () {
|
||||||
//console.log('status_content', this.status)
|
|
||||||
return {
|
return {
|
||||||
postLength: this.status.text.length,
|
postLength: this.status.text.length,
|
||||||
parseReadyDone: false
|
parseReadyDone: false
|
||||||
|
|
|
||||||
|
|
@ -57,14 +57,12 @@ const adminSettingsStorage = {
|
||||||
},
|
},
|
||||||
resetAdminDraft (state) {
|
resetAdminDraft (state) {
|
||||||
state.draft = cloneDeep(state.config)
|
state.draft = cloneDeep(state.config)
|
||||||
},
|
}
|
||||||
},
|
},
|
||||||
actions: {
|
actions: {
|
||||||
async fetchAdminUsers (store, opts) {
|
async fetchAdminUsers (store, opts) {
|
||||||
const users = await store.rootState.api.backendInteractor.adminListUsers({opts})
|
const users = await store.rootState.api.backendInteractor.adminListUsers({opts})
|
||||||
//await Promise.all(
|
users.forEach(user => store.dispatch('fetchUserIfMissing', user.id))
|
||||||
users.map(user => store.dispatch('fetchUserIfMissing', user.id))
|
|
||||||
//)
|
|
||||||
return users
|
return users
|
||||||
},
|
},
|
||||||
adminAddUserToAdminGroup (store, user) {
|
adminAddUserToAdminGroup (store, user) {
|
||||||
|
|
|
||||||
|
|
@ -137,9 +137,6 @@ const PLEROMA_ADMIN_USERS_URL = ({page, pageSize, filters = {}, query = '', name
|
||||||
return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
|
return `/api/v1/pleroma/admin/users?page=${page}&page_size=${pageSize}&filters=${filters_str}&query=${query}&name=${name}&email=${email}`
|
||||||
}
|
}
|
||||||
const PLEROMA_ADMIN_MODIFY_GROUP_URL = (nickname, group) => `/api/v1/pleroma/admin/users/${nickname}/permission_group/${group}`
|
const PLEROMA_ADMIN_MODIFY_GROUP_URL = (nickname, group) => `/api/v1/pleroma/admin/users/${nickname}/permission_group/${group}`
|
||||||
/*const PLEROMA_ADMIN_DELETE_USERS_URL = '/api/v1/pleroma/admin/users'
|
|
||||||
const PLEROMA_ADMIN_ACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/activate'
|
|
||||||
const PLEROMA_ADMIN_DEACTIVATE_USER_URL = '/api/v1/pleroma/admin/users/deactivate'*/
|
|
||||||
const PLEROMA_ADMIN_CONFIRM_USER_URL = '/api/v1/pleroma/admin/users/confirm_email'
|
const PLEROMA_ADMIN_CONFIRM_USER_URL = '/api/v1/pleroma/admin/users/confirm_email'
|
||||||
const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL = '/api/v1/pleroma/admin/users/resend_confirmation_email'
|
const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL = '/api/v1/pleroma/admin/users/resend_confirmation_email'
|
||||||
const PLEROMA_ADMIN_APPROVE_URL = '/api/v1/pleroma/admin/users/approve'
|
const PLEROMA_ADMIN_APPROVE_URL = '/api/v1/pleroma/admin/users/approve'
|
||||||
|
|
@ -708,7 +705,6 @@ const deleteUser = ({ credentials, user: { screen_name: nickname } }) => {
|
||||||
nicknames: [nickname]
|
nicknames: [nickname]
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
console.log(r)
|
|
||||||
return r.then(response => get(response, 'users.0'))
|
return r.then(response => get(response, 'users.0'))
|
||||||
/* const screenName = user.screen_name
|
/* const screenName = user.screen_name
|
||||||
const headers = authHeaders(credentials)
|
const headers = authHeaders(credentials)
|
||||||
|
|
@ -1484,7 +1480,6 @@ const adminListUsers = ({ opts, credentials }) => {
|
||||||
// the reported list is hardly useful because standards are for dating i guess,
|
// the reported list is hardly useful because standards are for dating i guess,
|
||||||
// so make sure to fetchIfMissing right afterward using this call
|
// so make sure to fetchIfMissing right afterward using this call
|
||||||
const url = PLEROMA_ADMIN_USERS_URL(opts)
|
const url = PLEROMA_ADMIN_USERS_URL(opts)
|
||||||
console.log('admin api: ', url)
|
|
||||||
return promisedRequest({ url: url,
|
return promisedRequest({ url: url,
|
||||||
credentials,
|
credentials,
|
||||||
method: 'GET'
|
method: 'GET'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue