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
8aec9de8
Commit
8aec9de8
authored
Jul 14, 2020
by
Taurie Davis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Migrate license policy submit loading button
parent
5223e316
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
20 deletions
+19
-20
ee/app/assets/javascripts/vue_shared/license_compliance/components/add_license_form.vue
...shared/license_compliance/components/add_license_form.vue
+16
-14
locale/gitlab.pot
locale/gitlab.pot
+3
-6
No files found.
ee/app/assets/javascripts/vue_shared/license_compliance/components/add_license_form.vue
View file @
8aec9de8
<
script
>
<
script
>
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
{
GlButton
}
from
'
@gitlab/ui
'
;
import
LoadingButton
from
'
~/vue_shared/components/loading_button.vue
'
;
import
{
LICENSE_APPROVAL_STATUS
}
from
'
../constants
'
;
import
{
LICENSE_APPROVAL_STATUS
}
from
'
../constants
'
;
import
AddLicenseFormDropdown
from
'
./add_license_form_dropdown.vue
'
;
import
AddLicenseFormDropdown
from
'
./add_license_form_dropdown.vue
'
;
import
{
s__
}
from
'
~/locale
'
;
import
{
s__
}
from
'
~/locale
'
;
...
@@ -10,7 +9,6 @@ export default {
...
@@ -10,7 +9,6 @@ export default {
components
:
{
components
:
{
AddLicenseFormDropdown
,
AddLicenseFormDropdown
,
GlButton
,
GlButton
,
LoadingButton
,
},
},
LICENSE_APPROVAL_STATUS
,
LICENSE_APPROVAL_STATUS
,
approvalStatusOptions
:
[
approvalStatusOptions
:
[
...
@@ -86,17 +84,21 @@ export default {
...
@@ -86,17 +84,21 @@ export default {
</label>
</label>
</div>
</div>
</div>
</div>
<loading-button
<div
class=
"gl-display-flex"
>
class=
"js-submit"
<gl-button
:disabled=
"submitDisabled"
class=
"js-submit"
:loading=
"loading"
:disabled=
"submitDisabled"
container-class=
"btn btn-success btn-align-content d-inline-flex"
:loading=
"loading"
:label=
"s__('LicenseCompliance|Submit')"
category=
"primary"
data-qa-selector=
"add_license_submit_button"
variant=
"success"
@
click=
"addLicense"
data-qa-selector=
"add_license_submit_button"
/>
@
click=
"addLicense"
<gl-button
class=
"js-cancel"
:disabled=
"loading"
@
click=
"closeForm"
>
>
{{
s__
(
'
LicenseCompliance|Cancel
'
)
}}
{{
__
(
'
Submit
'
)
}}
</gl-button>
</gl-button>
<gl-button
class=
"js-cancel ml-2"
:disabled=
"loading"
@
click=
"closeForm"
>
{{
__
(
'
Cancel
'
)
}}
</gl-button>
</div>
</div>
</div>
</
template
>
</
template
>
locale/gitlab.pot
View file @
8aec9de8
...
@@ -13444,9 +13444,6 @@ msgstr ""
...
@@ -13444,9 +13444,6 @@ msgstr ""
msgid "LicenseCompliance|Allowed"
msgid "LicenseCompliance|Allowed"
msgstr ""
msgstr ""
msgid "LicenseCompliance|Cancel"
msgstr ""
msgid "LicenseCompliance|Denied"
msgid "LicenseCompliance|Denied"
msgstr ""
msgstr ""
...
@@ -13506,9 +13503,6 @@ msgstr ""
...
@@ -13506,9 +13503,6 @@ msgstr ""
msgid "LicenseCompliance|Remove license?"
msgid "LicenseCompliance|Remove license?"
msgstr ""
msgstr ""
msgid "LicenseCompliance|Submit"
msgstr ""
msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project."
msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project."
msgstr ""
msgstr ""
...
@@ -22150,6 +22144,9 @@ msgstr ""
...
@@ -22150,6 +22144,9 @@ msgstr ""
msgid "Subkeys"
msgid "Subkeys"
msgstr ""
msgstr ""
msgid "Submit"
msgstr ""
msgid "Submit %{humanized_resource_name}"
msgid "Submit %{humanized_resource_name}"
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