info location to sysLocation

web_interface/src/wui-3/main.js

@@ -345,16 +345,16 @@ function authState() {
 //########## Info Form Validation ############
 
 function infoValidation(){
-  var sysname, owner, location,comment;
+  var sysname, owner, sysLocation,comment;
   sysname  = $('sysname').value,
   owner    = $('owner').value,
-  location = $('location').value,
+  sysLocation = $('sysLocation').value,
   comment  = $('comment').value;
 
   var flag = true;
   if(!ValidateAlphanumeric2(sysname, 'Название устройства')){flag = false;}
   if(!ValidateAlphanumeric2(owner, 'Владелец')){flag = false;}
-  if(!ValidateAlphanumeric2(location, 'Местоположение')){flag = false;}
+  if(!ValidateAlphanumeric2(sysLocation, 'Местоположение')){flag = false;}
   if(!ValidateAlphanumeric2(comment, 'Комментарии')){flag = false;}
 
   return flag;
@@ -970,7 +970,7 @@ function infoGet() {
     var info_labels = {
       sysname: ['Название устройства', data.sysname,     19],
       owner:   ['Владелец',            data.owner,       49],
-      location:['Местоположение',      data.sysLocation, 109],
+      sysLocation:['Местоположение',      data.sysLocation, 109],
       comment: ['Комментарии',         data.comment,     109]
     };
 

web_interface/src/wui-7/main.js

@@ -326,16 +326,16 @@ function telnetState() {
 //########## Info Form Validation ############
 
 function infoValidation(){
-  var sysname, owner, location,comment;
+  var sysname, owner, sysLocation,comment;
   sysname  = $('sysname').value,
   owner    = $('owner').value,
-  location = $('location').value,
+  sysLocation = $('sysLocation').value,
   comment  = $('comment').value;
 
   var flag = true;
   if(!ValidateAlphanumeric2(sysname, 'Название устройства')){flag = false;}
   if(!ValidateAlphanumeric2(owner, 'Владелец')){flag = false;}
-  if(!ValidateAlphanumeric2(location, 'Местоположение')){flag = false;}
+  if(!ValidateAlphanumeric2(sysLocation, 'Местоположение')){flag = false;}
   if(!ValidateAlphanumeric2(comment, 'Комментарии')){flag = false;}
 
   return flag;
@@ -957,7 +957,7 @@ function infoGet() {
     var info_labels = {
       sysname: ['Название устройства', data.sysname,     19],
       owner:   ['Владелец',            data.owner,       49],
-      location:['Местоположение',      data.sysLocation, 109],
+      sysLocation:['Местоположение',   data.sysLocation, 109],
       comment: ['Комментарии',         data.comment,     109]
     };
 

web_interface/src/wui-9/info.html

@@ -54,22 +54,6 @@
       <td>Серийный номер</td>
       <td id="serno"></td>
     </tr>
-<!--     <tr>
-      <td>Название устройства</td>
-      <td><input type="text" name="sysname" id="sysname" class="form-control" maxlength="19"></td>
-    </tr>
-    <tr>
-      <td>Владелец</td>
-      <td><input type="text" name="owner" id="owner" class="form-control" maxlength="49"></td>
-    </tr>
-    <tr>
-      <td>Местоположение</td>
-      <td><input type="text" name="sysLocation" id="location" class="form-control" maxlength="109"></td>
-    </tr>
-    <tr>
-      <td>Комментарии</td>
-      <td><input type="text" name="comment" id="comment" class="form-control" maxlength="109"></td>
-    </tr> -->
   </tbody>
   <thead>
     <tr>

web_interface/src/wui-9/main.js

@@ -349,16 +349,16 @@ function telnetState() {
 //########## Info Form Validation ############
 
 function infoValidation(){
-  var sysname, owner, location,comment;
+  var sysname, owner, sysLocation,comment;
   sysname  = $('sysname').value,
   owner    = $('owner').value,
-  location = $('location').value,
+  sysLocation = $('sysLocation').value,
   comment  = $('comment').value;
 
   var flag = true;
   if(!ValidateAlphanumeric2(sysname, 'Название устройства')){flag = false;}
   if(!ValidateAlphanumeric2(owner, 'Владелец')){flag = false;}
-  if(!ValidateAlphanumeric2(location, 'Местоположение')){flag = false;}
+  if(!ValidateAlphanumeric2(sysLocation, 'Местоположение')){flag = false;}
   if(!ValidateAlphanumeric2(comment, 'Комментарии')){flag = false;}
 
   return flag;
@@ -1018,7 +1018,7 @@ function infoGet() {
     var info_labels = {
       sysname: ['Название устройства', data.sysname,     19],
       owner:   ['Владелец',            data.owner,       49],
-      location:['Местоположение',      data.sysLocation, 109],
+      sysLocation:['Местоположение',   data.sysLocation, 109],
       comment: ['Комментарии',         data.comment,     109]
     };