Merge pull request #42 from grycap/devel/diana

fixing problem with new function form
grycap · Apr 12, 2019 · 41b4e10 · 41b4e10
2 parents 9c936fc + 8f98d47
commit 41b4e10
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/vue_app/src/components/forms/FunctionForm.vue b/vue_app/src/components/forms/FunctionForm.vue
@@ -492,9 +492,8 @@
 															></v-text-field>																						
 														</v-flex>  
 														<v-flex xs12 sm2 md2 style="padding-top:10px;">
-															<select id="classmemory" class="custom-select" >
-																<option style="display:none" selected></option>															
-																<option value="1">Mi</option>
+															<select id="classmemory" class="custom-select" >																										
+																<option selected value="1">Mi</option>
 																<option value="2">Gi</option>															
 															</select>
 														</v-flex>	
@@ -518,9 +517,8 @@
 															></v-text-field>											
 														</v-flex> 
 														<v-flex xs12 sm2 md2 style="padding-top:10px;"> 
-															<select id="classmemory2" class="custom-select" >
-																<option style="display:none" selected></option>															
-																<option value="1">Mi</option>
+															<select id="classmemory2" class="custom-select" >																															
+																<option selected value="1">Mi</option>
 																<option value="2">Gi</option>															
 															</select>
 														</v-flex> 
@@ -682,6 +680,8 @@ export default {
 			labels:{},
 			consts: [],
 			secrets: [],
+			limits_mem: '',
+			request_mem: '',
 
 			form: {
 				valid: false,
@@ -982,14 +982,24 @@ export default {
 				this.envVarsAll = this.extend (this.envVars, this.envVarsOneData);
 			}		
 			
+
 			var value = $("#classmemory option:selected").text();			
 			var value2 = $("#classmemory2 option:selected").text();				
-			console.log(this.envVarsAll)	
+				
 
-			var limits_mem = this.form.limits_memory + value;
-			var request_mem= this.form.request_memory + value2;
+			if (this.form.limits_memory == ""){
+				this.limits_mem = ''
+			}else{
+				this.limits_mem = this.form.limits_memory + value;
+			}
+
+			if (this.form.request_memory == ""){
+				this.request_mem = ''
+			}else{
+				this.request_mem= this.form.request_memory + value2;
+			}			
 
-			console.log(limits_mem,request_mem)
+			// console.log(this.limits_mem,this.request_mem)
 			
 			var params = {
 				'url': this.openFaaS.endpoint, 
@@ -1004,12 +1014,12 @@ export default {
 				'labels': this.labels,
 				'limits': 
 				{'cpu': this.form.limits_cpu,
-				'memory': limits_mem}
+				'memory': this.limits_mem}
 				,
 				'registryAuth': this.form.regAuth,
 				'requests': 
 				{'cpu': this.form.request_cpu,
-				'memory': request_mem}
+				'memory': this.request_mem}
 				,
 				'secrets': this.secrets }