Commit f0ec8b13 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'submit-license-policy-button' into 'master'

Submit license policy button

See merge request gitlab-org/gitlab!36871
parents d34fd321 8aec9de8
<script>
import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
import { GlButton } from '@gitlab/ui';
import LoadingButton from '~/vue_shared/components/loading_button.vue';
import { LICENSE_APPROVAL_STATUS } from '../constants';
import AddLicenseFormDropdown from './add_license_form_dropdown.vue';
import { s__ } from '~/locale';
......@@ -11,7 +10,6 @@ export default {
components: {
AddLicenseFormDropdown,
GlButton,
LoadingButton,
},
mixins: [glFeatureFlagsMixin()],
LICENSE_APPROVAL_STATUS,
......@@ -110,17 +108,21 @@ export default {
</div>
</div>
</div>
<loading-button
<div class="gl-display-flex">
<gl-button
class="js-submit"
:disabled="submitDisabled"
:loading="loading"
container-class="btn btn-success btn-align-content d-inline-flex"
:label="s__('LicenseCompliance|Submit')"
category="primary"
variant="success"
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 class="js-cancel ml-2" :disabled="loading" @click="closeForm">
{{ __('Cancel') }}
</gl-button>
</div>
</div>
</template>
......@@ -13836,9 +13836,6 @@ msgstr ""
msgid "LicenseCompliance|Allowed"
msgstr ""
msgid "LicenseCompliance|Cancel"
msgstr ""
msgid "LicenseCompliance|Denied"
msgstr ""
......@@ -13911,9 +13908,6 @@ msgstr ""
msgid "LicenseCompliance|Remove license?"
msgstr ""
msgid "LicenseCompliance|Submit"
msgstr ""
msgid "LicenseCompliance|There are currently no approved or blacklisted licenses in this project."
msgstr ""
......@@ -22753,6 +22747,9 @@ msgstr ""
msgid "Subkeys"
msgstr ""
msgid "Submit"
msgstr ""
msgid "Submit %{humanized_resource_name}"
msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment