Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
d484fef8
Unverified
Commit
d484fef8
authored
Jun 24, 2016
by
Christoph Wurst
Browse files
show which login name to use for the new app password
parent
04e3da0c
Changes
3
Hide whitespace changes
Inline
Side-by-side
settings/Controller/AuthSettingsController.php
View file @
d484fef8
...
...
@@ -118,6 +118,7 @@ class AuthSettingsController extends Controller {
return
[
'token'
=>
$token
,
'loginName'
=>
$loginName
,
'deviceToken'
=>
$deviceToken
];
}
...
...
settings/js/authtoken_view.js
View file @
d484fef8
...
...
@@ -107,6 +107,8 @@
_result
:
undefined
,
_newAppLoginName
:
undefined
,
_newAppPassword
:
undefined
,
_hideAppPasswordBtn
:
undefined
,
...
...
@@ -136,6 +138,7 @@
this
.
_addAppPasswordBtn
.
click
(
_
.
bind
(
this
.
_addAppPassword
,
this
));
this
.
_result
=
$
(
'
#app-password-result
'
);
this
.
_newAppLoginName
=
$
(
'
#new-app-login-name
'
);
this
.
_newAppPassword
=
$
(
'
#new-app-password
'
);
this
.
_newAppPassword
.
on
(
'
focus
'
,
_
.
bind
(
this
.
_onNewTokenFocus
,
this
));
this
.
_hideAppPasswordBtn
=
$
(
'
#app-password-hide
'
);
...
...
@@ -181,6 +184,9 @@
$
.
when
(
creatingToken
).
done
(
function
(
resp
)
{
_this
.
collection
.
add
(
resp
.
deviceToken
);
_this
.
render
();
_this
.
_newAppLoginName
.
text
(
t
(
'
core
'
,
'
You may now configure your client with username "{loginName}" and the following password:
'
,
{
loginName
:
resp
.
loginName
}));
_this
.
_newAppPassword
.
val
(
resp
.
token
);
_this
.
_toggleFormResult
(
false
);
_this
.
_newAppPassword
.
select
();
...
...
settings/templates/personal.php
View file @
d484fef8
...
...
@@ -203,6 +203,7 @@ if($_['passwordChangeSupported']) {
<button
id=
"add-app-password"
class=
"button"
>
<?php
p
(
$l
->
t
(
'Create new app password'
));
?>
</button>
</div>
<div
id=
"app-password-result"
class=
"hidden"
>
<span
id=
"new-app-login-name"
></span>
<input
id=
"new-app-password"
type=
"text"
readonly=
"readonly"
/>
<button
id=
"app-password-hide"
class=
"button"
>
<?php
p
(
$l
->
t
(
'Done'
));
?>
</button>
</div>
...
...
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