mirror of https://github.com/Bubka/2FAuth.git
Compare commits
2 Commits
5a74a37348
...
4d256c17d4
Author | SHA1 | Date |
---|---|---|
Bubka | 4d256c17d4 | |
Bubka | 64381c1a25 |
|
@ -22,7 +22,6 @@ on:
|
|||
- composer.lock
|
||||
- Dockerfile
|
||||
- phpunit.xml
|
||||
- server.php
|
||||
pull_request:
|
||||
branches:
|
||||
- dev
|
||||
|
@ -45,7 +44,6 @@ on:
|
|||
- composer.lock
|
||||
- Dockerfile
|
||||
- phpunit.xml
|
||||
- server.php
|
||||
|
||||
jobs:
|
||||
publish:
|
||||
|
|
|
@ -22,7 +22,6 @@ on:
|
|||
- composer.lock
|
||||
- Dockerfile
|
||||
- phpunit.xml
|
||||
- server.php
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
@ -45,7 +44,6 @@ on:
|
|||
- composer.lock
|
||||
- Dockerfile
|
||||
- phpunit.xml
|
||||
- server.php
|
||||
|
||||
jobs:
|
||||
test:
|
||||
|
|
|
@ -11,7 +11,11 @@
|
|||
const props = defineProps({
|
||||
userId: [Number, String],
|
||||
lastOnly: Boolean,
|
||||
showSearch: Boolean
|
||||
showSearch: Boolean,
|
||||
period: {
|
||||
type: [Number, String],
|
||||
default: 12
|
||||
},
|
||||
})
|
||||
|
||||
const periods = {
|
||||
|
@ -24,7 +28,7 @@
|
|||
const authentications = ref([])
|
||||
const isFetching = ref(false)
|
||||
const searched = ref('')
|
||||
const period = ref(periods.aMonth)
|
||||
const period = ref(props.period)
|
||||
const orderIsDesc = ref(true)
|
||||
|
||||
const emit = defineEmits(['has-more-entries'])
|
||||
|
@ -93,7 +97,7 @@
|
|||
.then(response => {
|
||||
authentications.value = response.data
|
||||
|
||||
if (authentications.value.length > 3) {
|
||||
if (authentications.value.length > 3 && props.lastOnly) {
|
||||
emit('has-more-entries')
|
||||
authentications.value.pop()
|
||||
}
|
||||
|
|
|
@ -134,7 +134,7 @@ export default {
|
|||
*
|
||||
* @returns promise
|
||||
*/
|
||||
getauthentications(id, period = 90, limit, config = {}) {
|
||||
getauthentications(id, period = 12, limit, config = {}) {
|
||||
return apiClient.get('/users/' + id + '/authentications?period=' + period + (limit ? '&limit=' + limit : ''), { ...config })
|
||||
},
|
||||
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
<div class="block is-size-7-mobile">
|
||||
{{ $t('admin.access_log_legend_for_user', { username: username }) }} (#{{ props.userId }})
|
||||
</div>
|
||||
<AccessLogViewer :userId="props.userId" :lastOnly="false" :showSearch="true" />
|
||||
<AccessLogViewer :userId="props.userId" :lastOnly="false" :showSearch="true" :period="1" />
|
||||
<!-- footer -->
|
||||
<VueFooter :showButtons="true">
|
||||
<ButtonBackCloseCancel :returnTo="{ name: 'admin.manageUser', params: { userId: props.userId }}" action="back" />
|
||||
|
|
Loading…
Reference in New Issue