rajven 4 лет назад
Родитель
Сommit
3081e85f5c
30 измененных файлов с 31 добавлено и 15 удалено
  1. 1 1
      docs/wiki/foswiki/data/FormAP.txt
  2. 1 1
      docs/wiki/foswiki/data/FormATS.txt
  3. 1 1
      docs/wiki/foswiki/data/FormCPO.txt
  4. 1 1
      docs/wiki/foswiki/data/FormHardware.txt
  5. 1 1
      docs/wiki/foswiki/data/FormIP.txt
  6. 1 1
      docs/wiki/foswiki/data/FormIPCAM.txt
  7. 1 1
      docs/wiki/foswiki/data/FormKvmHost.txt
  8. 2 1
      docs/wiki/foswiki/data/FormPhone.txt
  9. 1 1
      docs/wiki/foswiki/data/FormPrinter.txt
  10. 1 1
      docs/wiki/foswiki/data/FormRouter.txt
  11. 1 1
      docs/wiki/foswiki/data/FormSensor.txt
  12. 1 1
      docs/wiki/foswiki/data/FormServerOs.txt
  13. 1 1
      docs/wiki/foswiki/data/FormUps.txt
  14. 1 1
      docs/wiki/foswiki/data/FormVideoReg.txt
  15. 1 1
      docs/wiki/foswiki/data/FormVoipGate.txt
  16. 1 0
      docs/wiki/foswiki/data/IncludeAddAP.txt
  17. 1 0
      docs/wiki/foswiki/data/IncludeAddATS.txt
  18. 1 0
      docs/wiki/foswiki/data/IncludeAddCPO.txt
  19. 1 0
      docs/wiki/foswiki/data/IncludeAddGateway.txt
  20. 1 0
      docs/wiki/foswiki/data/IncludeAddHardware.txt
  21. 1 0
      docs/wiki/foswiki/data/IncludeAddIPCAM.txt
  22. 1 0
      docs/wiki/foswiki/data/IncludeAddPhone.txt
  23. 1 0
      docs/wiki/foswiki/data/IncludeAddPrinter.txt
  24. 1 0
      docs/wiki/foswiki/data/IncludeAddRouter.txt
  25. 1 0
      docs/wiki/foswiki/data/IncludeAddSensor.txt
  26. 1 0
      docs/wiki/foswiki/data/IncludeAddServer.txt
  27. 1 0
      docs/wiki/foswiki/data/IncludeAddUps.txt
  28. 1 0
      docs/wiki/foswiki/data/IncludeAddVideoReg.txt
  29. 1 0
      docs/wiki/foswiki/data/IncludeAddVoipGate.txt
  30. 1 0
      docs/wiki/foswiki/data/IncludeSelectPhoneTypes.txt

+ 1 - 1
docs/wiki/foswiki/data/FormAP.txt

@@ -24,7 +24,7 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | text | 1 | AP |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |

+ 1 - 1
docs/wiki/foswiki/data/FormATS.txt

@@ -6,8 +6,8 @@ This is a topic, used for create network device
 ---++ Data form definition of server os settings
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Device Type | text | 1 | ATS |
 | Name | text  | 80 | %BASETOPIC% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |

+ 1 - 1
docs/wiki/foswiki/data/FormCPO.txt

@@ -7,6 +7,7 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
@@ -22,7 +23,6 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | text | 10 | CPO  |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |

+ 1 - 1
docs/wiki/foswiki/data/FormHardware.txt

@@ -7,7 +7,7 @@ This is a topic, used for create server hardware
 ---++ Data form definition of server hardwares topics
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Device Type | text | 20 | Hardware |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Server OS | select | 1 | %INCLUDE{IncludeSelectServer}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Description | text | 80 | |

+ 1 - 1
docs/wiki/foswiki/data/FormIP.txt

@@ -7,7 +7,7 @@
 | Mac | text | 20 | |
 | Description | text | 80 | |
 | Dns Name | text  | 80 | |
-| Parent | select | 1 | %INCLUDE{includeSelectNetHost}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetHost}% |
 | Subnet Parent | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 
 -- Main.RomanDmitriev - 2020/10/11

+ 1 - 1
docs/wiki/foswiki/data/FormIPCAM.txt

@@ -7,6 +7,7 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Videoregistrator | select | 1 | %INCLUDE{IncludeSelectVideoReg}% |
 | Dns Name | text  | 80 | |
@@ -20,7 +21,6 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | text | 10 | IPCAM |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |

+ 1 - 1
docs/wiki/foswiki/data/FormKvmHost.txt

@@ -8,7 +8,7 @@
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Description | text | 80 | |
-| Device Type | text | 10 | KvmHost |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | VirtualCluster | select | 1 | %INCLUDE{IncludeSelectCluster}% |
 | Device OS | select | 1 | %INCLUDE{IncludeSelectOsList}% |
 | Device CPU | text | 20 | |

+ 2 - 1
docs/wiki/foswiki/data/FormPhone.txt

@@ -6,11 +6,12 @@ This is a topic, used for create network device
 ---++ Data form definition of server os settings
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Device Type | select | 1 | IP-телефон, Цифровой, Аналоговый  |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | ATS | select+multi | 2 | %INCLUDE{IncludeSelectATS}% |
 | Voip Gate | select | 1 | %INCLUDE{IncludeSelectVoipGate}% |
+| Phone Type | select | 1 | %INCLUDE{IncludeSelectPhoneTypes}%  |
 | Phone Number | text | 30 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |

+ 1 - 1
docs/wiki/foswiki/data/FormPrinter.txt

@@ -8,6 +8,7 @@ This is a topic, used for create network device
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Share Name | text | 40 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
@@ -28,7 +29,6 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | select | 1 | Printer |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |

+ 1 - 1
docs/wiki/foswiki/data/FormRouter.txt

@@ -7,6 +7,7 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
@@ -25,7 +26,6 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | select | 1 | Router, Gateway |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |

+ 1 - 1
docs/wiki/foswiki/data/FormSensor.txt

@@ -7,6 +7,7 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
@@ -20,7 +21,6 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | text | 10 | Sensor |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |

+ 1 - 1
docs/wiki/foswiki/data/FormServerOs.txt

@@ -3,12 +3,12 @@
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Hardware | select | 1 | %INCLUDE{IncludeSelectClusterHardware}% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Dns Name | text | 80 | |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Description | text | 80 | |
-| Device Type | text | 10 | Server |
 | Device OS | select | 1 | %INCLUDE{IncludeSelectOsList}% |
 | Device CPU | text | 20 | |
 | Device Memory | text | 20 | |

+ 1 - 1
docs/wiki/foswiki/data/FormUps.txt

@@ -22,7 +22,7 @@ This is a topic, used for create UPS
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | select | 1 | UPS |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |

+ 1 - 1
docs/wiki/foswiki/data/FormVideoReg.txt

@@ -20,7 +20,7 @@ This is a topic, used for create network device
 | Uplink | text | 20 | |
 | Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | text | 10 | VideoRegistrator  |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |

+ 1 - 1
docs/wiki/foswiki/data/FormVoipGate.txt

@@ -6,8 +6,8 @@ This is a topic, used for create network device
 ---++ Data form definition of server os settings
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Device Type | text | 10 | VoipGate |
 | Name | text  | 80 | %BASETOPIC% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
 | Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | ATS | select+multi | 2 | %INCLUDE{IncludeSelectATS}% |
 | Phone Number | text | 30 | |

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddAP.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormAP" />
+     <input type="hidden" name="DeviceType" value="AP" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddATS.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormATS" />
+     <input type="hidden" name="DeviceType" value="ATS" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddCPO.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormCPO" />
+     <input type="hidden" name="DeviceType" value="CPO" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddGateway.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormNetDevice" />
+     <input type="hidden" name="DeviceType" value="Gateway" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddHardware.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormHardware" />
+     <input type="hidden" name="DeviceType" value="Hardware" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddIPCAM.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormIPCAM" />
+     <input type="hidden" name="DeviceType" value="IPCAM" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddPhone.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormPhone" />
+     <input type="hidden" name="DeviceType" value="VoipPhone" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddPrinter.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormPrinter" />
+     <input type="hidden" name="DeviceType" value="Printer" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddRouter.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormNetDevice" />
+     <input type="hidden" name="DeviceType" value="Router" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddSensor.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormSensor" />
+     <input type="hidden" name="DeviceType" value="Sensor" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddServer.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormServerOs" />
+     <input type="hidden" name="DeviceType" value="Server" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddUps.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormUps" />
+     <input type="hidden" name="DeviceType" value="UPS" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddVideoReg.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormVideoReg" />
+     <input type="hidden" name="DeviceType" value="VideoRegistrator" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeAddVoipGate.txt

@@ -5,5 +5,6 @@
      <input type="hidden" name="onlywikiname" value="off" />
      <input type="hidden" name="topicparent" value="%BASETOPIC%" />
      <input type="hidden" name="formtemplate" value="FormVoipGate" />
+     <input type="hidden" name="DeviceType" value="VoipGate" />
      <input type="submit" value="Create" />
 </form>

+ 1 - 0
docs/wiki/foswiki/data/IncludeSelectPhoneTypes.txt

@@ -0,0 +1 @@
+IP-телефон, Цифровой, Аналоговый