Merge branch 'develop' into pr/ThatOneCalculator/8764
This commit is contained in:
commit
09d1ba9f68
21 changed files with 285 additions and 114 deletions
|
@ -42,6 +42,7 @@ import MkSignin from '@/components/signin.vue';
|
|||
import MkButton from '@/components/ui/button.vue';
|
||||
import * as os from '@/os';
|
||||
import { login } from '@/account';
|
||||
import { appendQuery, query } from '@/scripts/url';
|
||||
|
||||
export default defineComponent({
|
||||
components: {
|
||||
|
@ -82,7 +83,9 @@ export default defineComponent({
|
|||
|
||||
this.state = 'accepted';
|
||||
if (this.callback) {
|
||||
location.href = `${this.callback}?session=${this.session}`;
|
||||
location.href = appendQuery(this.callback, query({
|
||||
session: this.session
|
||||
}));
|
||||
}
|
||||
},
|
||||
deny() {
|
||||
|
|
|
@ -54,6 +54,9 @@
|
|||
<FormButton v-if="user.host != null" class="_formBlock" @click="updateRemoteUser"><i class="fas fa-sync"></i> {{ $ts.updateRemoteUser }}</FormButton>
|
||||
</FormSection>
|
||||
|
||||
<MkObjectView v-if="info && $i.isAdmin" tall :value="info">
|
||||
</MkObjectView>
|
||||
|
||||
<MkObjectView tall :value="user">
|
||||
</MkObjectView>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue