Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
3bb39a86
Commit
3bb39a86
authored
Oct 16, 2018
by
James Edwards-Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Group SAML test button internationalization
parent
f5af8281
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
4 deletions
+17
-4
ee/app/assets/javascripts/saml_providers/saml_settings_form.js
...p/assets/javascripts/saml_providers/saml_settings_form.js
+4
-3
ee/app/views/groups/saml_providers/_test_button.html.haml
ee/app/views/groups/saml_providers/_test_button.html.haml
+1
-1
locale/gitlab.pot
locale/gitlab.pot
+12
-0
No files found.
ee/app/assets/javascripts/saml_providers/saml_settings_form.js
View file @
3bb39a86
import
$
from
'
jquery
'
;
import
$
from
'
jquery
'
;
import
{
__
}
from
'
~/locale
'
;
import
DirtyFormChecker
from
'
./dirty_form_checker
'
;
import
DirtyFormChecker
from
'
./dirty_form_checker
'
;
export
default
class
SamlSettingsForm
{
export
default
class
SamlSettingsForm
{
...
@@ -29,14 +30,14 @@ export default class SamlSettingsForm {
...
@@ -29,14 +30,14 @@ export default class SamlSettingsForm {
testButtonTooltip
()
{
testButtonTooltip
()
{
if
(
!
this
.
enabled
)
{
if
(
!
this
.
enabled
)
{
return
'
Group SAML must be enabled to test
'
;
return
__
(
'
Group SAML must be enabled to test
'
)
;
}
}
if
(
this
.
dirtyFormChecker
.
isDirty
)
{
if
(
this
.
dirtyFormChecker
.
isDirty
)
{
return
'
Save changes before testing
'
;
return
__
(
'
Save changes before testing
'
)
;
}
}
return
'
Redirect to SAML provider to test configuration
'
;
return
__
(
'
Redirect to SAML provider to test configuration
'
)
;
}
}
updateView
()
{
updateView
()
{
...
...
ee/app/views/groups/saml_providers/_test_button.html.haml
View file @
3bb39a86
-
if
saml_provider
.
persisted?
-
if
saml_provider
.
persisted?
=
saml_link_for_provider
'Test SAML SSO'
,
saml_provider
,
redirect:
request
.
url
,
html_class:
'btn qa-saml-settings-test-button'
=
saml_link_for_provider
_
(
'Test SAML SSO'
)
,
saml_provider
,
redirect:
request
.
url
,
html_class:
'btn qa-saml-settings-test-button'
locale/gitlab.pot
View file @
3bb39a86
...
@@ -3876,6 +3876,9 @@ msgstr ""
...
@@ -3876,6 +3876,9 @@ msgstr ""
msgid "Group Runners"
msgid "Group Runners"
msgstr ""
msgstr ""
msgid "Group SAML must be enabled to test"
msgstr ""
msgid "Group avatar"
msgid "Group avatar"
msgstr ""
msgstr ""
...
@@ -6435,6 +6438,9 @@ msgstr ""
...
@@ -6435,6 +6438,9 @@ msgstr ""
msgid "Recent searches"
msgid "Recent searches"
msgstr ""
msgstr ""
msgid "Redirect to SAML provider to test configuration"
msgstr ""
msgid "Reference:"
msgid "Reference:"
msgstr ""
msgstr ""
...
@@ -6769,6 +6775,9 @@ msgstr ""
...
@@ -6769,6 +6775,9 @@ msgstr ""
msgid "Save changes"
msgid "Save changes"
msgstr ""
msgstr ""
msgid "Save changes before testing"
msgstr ""
msgid "Save pipeline schedule"
msgid "Save pipeline schedule"
msgstr ""
msgstr ""
...
@@ -7538,6 +7547,9 @@ msgstr ""
...
@@ -7538,6 +7547,9 @@ msgstr ""
msgid "Terms of Service and Privacy Policy"
msgid "Terms of Service and Privacy Policy"
msgstr ""
msgstr ""
msgid "Test SAML SSO"
msgstr ""
msgid "Test coverage parsing"
msgid "Test coverage parsing"
msgstr ""
msgstr ""
...
...
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