Fix config map and secret issue

https://github.com/rancher/rancher/issues/13104
This commit is contained in:
loganhz 2018-04-27 10:55:06 +08:00
parent 7bbf8845af
commit e6cd90bafc
4 changed files with 15 additions and 3 deletions

View File

@ -36,7 +36,10 @@ export default Component.extend(ViewNewEdit, OptionallyNamespaced, {
},
validate() {
return true;
const errors = [];
errors.pushObjects(get(this,'namespaceErrors')||[]);
set(this,'errors', errors);
return errors.length === 0;
},
doSave() {

View File

@ -1,4 +1,4 @@
import { set } from '@ember/object';
import { get, set } from '@ember/object';
import Component from '@ember/component';
import ViewNewEdit from 'shared/mixins/view-new-edit';
import OptionallyNamespaced from 'shared/mixins/optionally-namespaced';
@ -21,6 +21,14 @@ export default Component.extend(ViewNewEdit, OptionallyNamespaced, {
projectType: 'secret',
namespacedType: 'namespacedSecret',
validate() {
const errors = [];
errors.pushObjects(get(this,'namespaceErrors')||[]);
set(this,'errors', errors);
return errors.length === 0;
},
doSave() {
let self = this;
let sup = self._super;

View File

@ -22,7 +22,7 @@
}}
{{/if}}
{{optionally-namespaced scope=scope mode=mode namespace=namespace model=model}}
{{optionally-namespaced namespaceErrors=namespaceErrors scope=scope mode=mode namespace=namespace model=model}}
<div class="box mt-10">
<label class="acc-label">{{t 'newSecret.values.label'}}</label>

View File

@ -11,6 +11,7 @@ export default Component.extend({
scope: null,
namespace: null,
model: null,
namespaceErrors: null,
isView: equal('mode', VIEW),
isNew: equal('mode', NEW),