Przeglądaj źródła

rewrite Form for foswiki to INCLUDE

rajven 4 lat temu
rodzic
commit
0cab9053d1
59 zmienionych plików z 187 dodań i 113 usunięć
  1. 7 7
      docs/wiki/foswiki/data/FormAP.txt
  2. 4 4
      docs/wiki/foswiki/data/FormATS.txt
  3. 6 6
      docs/wiki/foswiki/data/FormCPO.txt
  4. 2 2
      docs/wiki/foswiki/data/FormCertificate.txt
  5. 3 2
      docs/wiki/foswiki/data/FormDhcpPool.txt
  6. 1 1
      docs/wiki/foswiki/data/FormDnsZone.txt
  7. 1 1
      docs/wiki/foswiki/data/FormHardware.txt
  8. 2 2
      docs/wiki/foswiki/data/FormIP.txt
  9. 6 6
      docs/wiki/foswiki/data/FormIPCAM.txt
  10. 7 6
      docs/wiki/foswiki/data/FormKvmHost.txt
  11. 8 8
      docs/wiki/foswiki/data/FormNetDevice.txt
  12. 7 7
      docs/wiki/foswiki/data/FormPhone.txt
  13. 5 5
      docs/wiki/foswiki/data/FormPrinter.txt
  14. 1 1
      docs/wiki/foswiki/data/FormRack.txt
  15. 1 1
      docs/wiki/foswiki/data/FormRoom.txt
  16. 9 9
      docs/wiki/foswiki/data/FormRouter.txt
  17. 5 5
      docs/wiki/foswiki/data/FormSensor.txt
  18. 6 6
      docs/wiki/foswiki/data/FormServerOs.txt
  19. 3 2
      docs/wiki/foswiki/data/FormService.txt
  20. 2 2
      docs/wiki/foswiki/data/FormServiceDns.txt
  21. 2 2
      docs/wiki/foswiki/data/FormSimple.txt
  22. 2 2
      docs/wiki/foswiki/data/FormSite.txt
  23. 3 2
      docs/wiki/foswiki/data/FormSubnet.txt
  24. 5 5
      docs/wiki/foswiki/data/FormUps.txt
  25. 5 5
      docs/wiki/foswiki/data/FormVideoReg.txt
  26. 5 5
      docs/wiki/foswiki/data/FormVirtual.txt
  27. 2 2
      docs/wiki/foswiki/data/FormVlan.txt
  28. 5 5
      docs/wiki/foswiki/data/FormVoipGate.txt
  29. 2 2
      docs/wiki/foswiki/data/FormWirelessProfile.txt
  30. 1 0
      docs/wiki/foswiki/data/IncludeSelectATS.txt
  31. 1 0
      docs/wiki/foswiki/data/IncludeSelectBuilding.txt
  32. 1 0
      docs/wiki/foswiki/data/IncludeSelectCertParent.txt
  33. 1 0
      docs/wiki/foswiki/data/IncludeSelectCluster.txt
  34. 1 0
      docs/wiki/foswiki/data/IncludeSelectClusterHardware.txt
  35. 1 0
      docs/wiki/foswiki/data/IncludeSelectDeviceParent.txt
  36. 20 0
      docs/wiki/foswiki/data/IncludeSelectDeviceType.txt
  37. 1 0
      docs/wiki/foswiki/data/IncludeSelectDhcpPool.txt
  38. 1 0
      docs/wiki/foswiki/data/IncludeSelectDnsZone.txt
  39. 1 0
      docs/wiki/foswiki/data/IncludeSelectDomain.txt
  40. 1 0
      docs/wiki/foswiki/data/IncludeSelectEtherNetType.txt
  41. 1 0
      docs/wiki/foswiki/data/IncludeSelectHardware.txt
  42. 21 0
      docs/wiki/foswiki/data/IncludeSelectKvmHostParent.txt
  43. 1 0
      docs/wiki/foswiki/data/IncludeSelectNetHost.txt
  44. 1 0
      docs/wiki/foswiki/data/IncludeSelectNetParent.txt
  45. 1 0
      docs/wiki/foswiki/data/IncludeSelectOsList.txt
  46. 1 0
      docs/wiki/foswiki/data/IncludeSelectPlace.txt
  47. 1 0
      docs/wiki/foswiki/data/IncludeSelectPoeType.txt
  48. 1 0
      docs/wiki/foswiki/data/IncludeSelectRack.txt
  49. 1 0
      docs/wiki/foswiki/data/IncludeSelectRoom.txt
  50. 1 0
      docs/wiki/foswiki/data/IncludeSelectSSID.txt
  51. 1 0
      docs/wiki/foswiki/data/IncludeSelectServer.txt
  52. 2 0
      docs/wiki/foswiki/data/IncludeSelectServiceType.txt
  53. 1 0
      docs/wiki/foswiki/data/IncludeSelectSubnet.txt
  54. 1 0
      docs/wiki/foswiki/data/IncludeSelectVendor.txt
  55. 1 0
      docs/wiki/foswiki/data/IncludeSelectVideoReg.txt
  56. 1 0
      docs/wiki/foswiki/data/IncludeSelectVirtualGuestTypes.txt
  57. 1 0
      docs/wiki/foswiki/data/IncludeSelectVoipGate.txt
  58. 1 0
      docs/wiki/foswiki/data/IncludeSelectWLAC.txt
  59. 1 0
      docs/wiki/foswiki/data/IncludeSelectWirelessPSK.txt

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

@@ -7,25 +7,25 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
-| Poe In | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
+| Poe In | select | 1 | %INCLUDE{IncludeSelectPoeType}% |
 | SN | text | 80 | |
 | WLAC | checkbox | 1 | Yes |
-| WLAC Name | select | 1 | , %SEARCH{"\.*" scope="topic" topic="WirelessController*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| WLAC Name | select | 1 | %INCLUDE{IncludeSelectWLAC}% |
 | Wlac Ap Id | text | 10 | |
 | Wlac Ap Group | text | 15 | |
-| SSIDs | select+multi | 7 | , %SEARCH{"\.*" scope="topic" topic="WirelessProfile*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(WirelessSSID)"}% |
+| SSIDs | select+multi | 7 | %INCLUDE{IncludeSelectSSID}% |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
 | Device Type | text | 1 | AP |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -8,18 +8,18 @@ This is a topic, used for create network device
 | *Name*  | *Type* | *Size* | *Values* |
 | Device Type | text | 1 | ATS |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -7,23 +7,23 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Power Outlets | text | 10 | |
-| Network Interface | select+multi+values | 3 | Ethernet=eth, Wifi 2.4G=wifi4, Wifi 5G=wifi5 |
+| Network Interface | select+multi+values | 3 | %INCLUDE{IncludeSelectEtherNetType}% |
 | Community | text | 20 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
 | Device Type | text | 10 | CPO  |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |
 | Disabled | checkbox | 1 |  Yes |

+ 2 - 2
docs/wiki/foswiki/data/FormCertificate.txt

@@ -6,12 +6,12 @@ This is a topic for used certificate info
 ---++ Data form definition of used certifacates
 
 | *Name*  | *Type* | *Size* | *Values* |
-| CertType | select+value | 1 | Free, Paid |
+| CertType | select | 1 | Free, Paid |
 | Name | text  | 80 | %BASETOPIC% |
 | Dns Name | text | 80 | |
 | Description | text | 80 | |
 | Cert Alt names | text | 255 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Gateway*,Site*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectCertParent}% |
 | Cert Vendor | text | 80 | |
 | Cert Period | text | 80 | |
 | Cert Valid To | date | | |

+ 3 - 2
docs/wiki/foswiki/data/FormDhcpPool.txt

@@ -4,6 +4,7 @@
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text | 40 | %BASETOPIC% |
 | Description | text | 80 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Gateway*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Subnet | select | 1 | , %SEARCH{"Subnet" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
+| Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
+
 -- Main.RomanDmitriev - 2020/10/11

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

@@ -5,6 +5,6 @@
 | Name | text | 80 | %BASETOPIC% |
 | Description | text | 80 | |
 | Dns Zone Name | text | 80 | |
-| Domain Name | select | 1 | , %SEARCH{search="\.*" scope="topic" topic="Domain*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%  |
+| Domain Name | select | 1 | %INCLUDE{IncludeSelectDomain}% |
 
 -- Main.RomanDmitriev - 2020/10/12

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

@@ -8,7 +8,7 @@ This is a topic, used for create server hardware
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Device Type | text | 20 | Hardware |
-| Server OS | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Vmware*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Server OS | select | 1 | %INCLUDE{IncludeSelectServer}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Description | text | 80 | |
 | Form Factor | select+values | 1 | 1U, 2U, 3U, 4U, 5U, Other |

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

@@ -7,7 +7,7 @@
 | Mac | text | 20 | |
 | Description | text | 80 | |
 | Dns Name | text  | 80 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Gateway*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Subnet Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{includeSelectNetHost}% |
+| Subnet Parent | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 
 -- Main.RomanDmitriev - 2020/10/11

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

@@ -7,21 +7,21 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Videoregistrator | select | 1 | , %SEARCH{"\.*" topic="DeviceVideoReg*" scope="topic" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(DnsName)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Videoregistrator | select | 1 | %INCLUDE{IncludeSelectVideoReg}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
-| Poe In | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
+| Poe In | select | 1 | %INCLUDE{IncludeSelectPoeType}% |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*"  topic="Switch*" scope="topic" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(DnsName)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
 | Device Type | text | 10 | IPCAM |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

+ 7 - 6
docs/wiki/foswiki/data/FormKvmHost.txt

@@ -2,20 +2,21 @@
 ---++ Data form
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Hardware | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Hardware | select | 1 | %INCLUDE{IncludeSelectClusterHardware}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Dns Name | text | 80 | |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Description | text | 80 | |
 | Device Type | text | 10 | KvmHost |
-| Device OS | select+value | 1 | Centos 5, Centos 6, Centos 7, Centos 8, Ubuntu 14, Ubuntu 16, Ubuntu 18, Ubuntu 20, Debian 10, Linux |
+| VirtualCluster | select | 1 | %INCLUDE{IncludeSelectCluster}% |
+| Device OS | select | 1 | %INCLUDE{IncludeSelectOsList}% |
 | Device CPU | text | 20 | |
 | Device Memory | text | 20 | |
 | Uplink | text | 40 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 40 | |
-| Device Subnet | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | User List | text | 80 | |

+ 8 - 8
docs/wiki/foswiki/data/FormNetDevice.txt

@@ -7,24 +7,24 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
-| Poe In | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
-| Poe Out | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
+| Poe In | select | 1 | %INCLUDE{IncludeSelectPoeType}% |
+| Poe Out | select | 1 |  %INCLUDE{IncludeSelectPoeType}% |
 | Poe W | text | 10 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | select+value | 1 | Server, Computer, Switch, Router, Gateway, UPS, Sensor, AP, WLAC, Projector, Ats, Voip-Phone, Other  |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectDeviceType}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

+ 7 - 7
docs/wiki/foswiki/data/FormPhone.txt

@@ -6,23 +6,23 @@ This is a topic, used for create network device
 ---++ Data form definition of server os settings
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Device Type | select+value | 1 | IP-телефон, Цифровой, Аналоговый  |
+| Device Type | select | 1 | IP-телефон, Цифровой, Аналоговый  |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| ATS | select+multi | 2 | , %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Voip Gate | select | 1 | , %SEARCH{"\.*" scope="topic" topic="DeviceVoipGate*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| ATS | select+multi | 2 | %INCLUDE{IncludeSelectATS}% |
+| Voip Gate | select | 1 | %INCLUDE{IncludeSelectVoipGate}% |
 | Phone Number | text | 30 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -7,11 +7,11 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Share Name | text | 40 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Printing Type | select+values | 1 | лазерный/светодиодный=laser, струйный=inkjet, сублимационный=sublimation, термопринтер=thermal |
@@ -26,10 +26,10 @@ This is a topic, used for create network device
 | Community | text | 20 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Switch*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | select+value | 1 | Printer |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Type | select | 1 | Printer |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -2,7 +2,7 @@
 ---+ Basic info by closet
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Name | text | 40 | %BASETOPIC% |
 | Description | text | 80 | |
 

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

@@ -2,7 +2,7 @@
 ---+ Basic info by closet
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectBuilding}% |
 | Name | text | 40 | %BASETOPIC% |
 | Description | text | 80 | |
 

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

@@ -7,26 +7,26 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
-| Hardware | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Hardware | select | 1 | %INCLUDE{IncludeSelectHarware}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Routing Type | select+multi+values | 4 | BGP, RIP, OSPF, Static |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
-| Poe In | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
-| Poe Out | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
+| Poe In | select | 1 | %INCLUDE{IncludeSelectPoeType}% |
+| Poe Out | select | 1 | %INCLUDE{IncludeSelectPoeType}% |
 | Poe W | text | 10 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Type | select+value | 1 | Server, Computer, Switch, Router, Gateway, UPS, Sensor, AP, WLAC, Projector, Ats, Voip-Phone, Other  |
-| Device Subnet | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Type | select | 1 | Router, Gateway |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -7,21 +7,21 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%, %SEARCH{"\.*" scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
-| Poe In | select | 1 | Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy |
+| Poe In | select | 1 | %INCLUDE{IncludeSelectPoeType}% |
 | Sensor Types | select+multi+values | 9 | Напряжение=Volt, Ток=Circut, Влажность=Humidity, Температура=Temperature, Давление=Pressure, Протечка=Leak, Дым=Smoke, Пожар=Fire, Контакт=DryContact  |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
 | Device Type | text | 10 | Sensor |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -2,20 +2,20 @@
 ---++ Data form
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Hardware | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Hardware | select | 1 | %INCLUDE{IncludeSelectClusterHardware}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Dns Name | text | 80 | |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Description | text | 80 | |
 | Device Type | text | 10 | Server |
-| Device OS | select+value | 1 | Windows 2003, Windows 2008, Windows 2012, Windows 2016, Windows XP, Windows Vista, Windows 7, Windows 8, Windows 10, Centos 5, Centos 6, Centos 7, Centos 8, Ubuntu 14, Ubuntu 16, Ubuntu 18, Ubuntu 20, Linux, Windows |
+| Device OS | select | 1 | %INCLUDE{IncludeSelectOsList}% |
 | Device CPU | text | 20 | |
 | Device Memory | text | 20 | |
 | Uplink | text | 40 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 40 | |
-| Device Subnet | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | User List | text | 80 | |
 -- Main.RomanDmitriev - 2020/10/05

+ 3 - 2
docs/wiki/foswiki/data/FormService.txt

@@ -2,8 +2,9 @@
 ---++ Data form
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Gateway*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectDeviceParent}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Description | text | 80 | |
-| Service type | select | 1 | DNS,DHCP,HTTP,TFTP,NTP,SMTP,POP3,IMAP,SSH,Openvpn,Nagios,MySQL,PostgreSQL,Radius,Ldap,Fprobe,NFS,Nfcapd,Samba,Ftp,RsyncD,SSH,Elasticsearch,Graylog,Syslog,Rsyslog,Syslog-ng,MongoDB,Coturn,Kannel,Smsd,Vlc,ffmpeg,Other |
+| Service type | select | 1 | %INCLUDE{IncludeSelectServiceType}% |
+
 -- Main.RomanDmitriev - 2020/10/12

+ 2 - 2
docs/wiki/foswiki/data/FormServiceDns.txt

@@ -2,11 +2,11 @@
 ---++ Data form
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Gateway*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectDeviceParent}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Description | text | 80 | |
 | Service type | text | 10 | DNS |
-| Zone List | select+multi | 10 | , %SEARCH{"\.*" scope="topic" topic="Dns*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Zone List | select+multi | 10 | %INCLUDE{IncludeSelectDnsZone}% |
 
 -- Main.RomanDmitriev - 2020/10/15
 

+ 2 - 2
docs/wiki/foswiki/data/FormSimple.txt

@@ -7,8 +7,8 @@ This is a topic, used for create device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
 | Description | text | 80 | |
 

+ 2 - 2
docs/wiki/foswiki/data/FormSite.txt

@@ -1,14 +1,14 @@
 %META:TOPICINFO{author="roman" comment="reprev" date="1602792683" format="1.1" reprev="1" version="3"}%
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectServer}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Description | text | 80 | |
 | Dns Name | text  | 80 | |
 | Http proto | select | 1 | https, http |
 | Site alias | text | 80 | |
 | Site IP | text | 20 | |
-| Backend | select+value | 1 | Nginx, Apache, Nginx+Apache, Nginx+fsgi, Nginx+uWSGI, Other |
+| Backend | select | 1 | Nginx, Apache, Nginx+Apache, Nginx+fsgi, Nginx+uWSGI, Other |
 | Disabled | checkbox | 1 |  Yes |
 | Deleted | checkbox | 1 |  Yes |
 

+ 3 - 2
docs/wiki/foswiki/data/FormSubnet.txt

@@ -2,11 +2,12 @@
 ---+ Basic info for subnet
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Subnet Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Gateway*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Subnet Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Subnet | text  | 80 | |
 | Description | text | 255 | |
 | Subnet Type | select+values | 1 | Public, Private |
 | Subnet Mask | select+values | 1 | 255.0.0.0=8, 255.128.0.0=9, 255.192.0.0=10, 255.224.0.0=11, 255.240.0.0=12, 255.248.0.0=13, 255.252.0.0=14, 255.254.0.0=15, 255.255.0.0=16, 255.255.128.0=17, 255.255.192.0=18, 255.255.224.0=19, 255.255.240.0=20, 255.255.248.0=21, 255.255.252.0=22, 255.255.254.0=23, 255.255.255.0=24, 255.255.255.128=25, 255.255.255.192=26, 255.255.255.224=27, 255.255.255.240=28, 255.255.255.248=29, 255.255.255.252=30, 255.255.255.254=31, 255.255.255.255=32 |
-| Subnet Dhcp Pool | select | 1 | , %SEARCH{"\.*" scope="topic" topic="DhcpPool*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Subnet Dhcp Pool | select | 1 | %INCLUDE{IncludeSelectDhcpPool}% |
+
 -- Main.RomanDmitriev - 2020/10/11

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

@@ -7,12 +7,12 @@ This is a topic, used for create UPS
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Last battery changed | date | | |
@@ -20,10 +20,10 @@ This is a topic, used for create UPS
 | SN | text | 80 | |
 | Community | text | 20 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
 | Device Type | select | 1 | UPS |
-| Device Subnet | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |
 | Disabled | checkbox | 1 |  Yes |

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

@@ -7,21 +7,21 @@ This is a topic, used for create network device
 
 | *Name*  | *Type* | *Size* | *Values* |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| Rack | select | 1 | , %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| Rack | select | 1 | %INCLUDE{IncludeSelectRack}% |
 | Unit | text | 10 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Camera Count | text | 10 | |
 | IQN | text | 100 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
 | Device Type | text | 10 | VideoRegistrator  |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |
 | Disabled | checkbox | 1 |  Yes |

+ 5 - 5
docs/wiki/foswiki/data/FormVirtual.txt

@@ -2,18 +2,18 @@
 ---++ Data form
 
 | *Name*  | *Type* | *Size* | *Values* |
-| ParentHost | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Cluster*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| ParentHost | select | 1 | %INCLUDE{IncludeSelectKvmHostParent}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Dns Name | text | 80 | |
 | Description | text | 80 | |
-| Device Type | select | 1 | Virtual KVM, Virtual OpenVZ, Virtual Docker, Virtual ESXi |
-| Device OS | select | 1 | Windows 2003, Windows 2008, Windows 2012, Windows 2016, Windows XP, Windows Vista, Windows 7, Windows 8, Windows 10, Centos 5, Centos 6, Centos 7, Centos 8, Ubuntu 14, Ubuntu 16, Ubuntu 18, Ubuntu 20, Linux, Windows |
+| Device Type | select | 1 | %INCLUDE{IncludeSelectVirtualGuestTypes}% |
+| Device OS | select | 1 | %INCLUDE{IncludeSelectOsList}% |
 | Device CPU | text | 20 | |
 | Device Memory | text | 20 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 |  %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Subnet | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Device Subnet | select | 1 |  %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 16 | |
 | User List | text | 80 | |

+ 2 - 2
docs/wiki/foswiki/data/FormVlan.txt

@@ -2,11 +2,11 @@
 ---++ Data form definition of vlan
 
 | *Name*  | *Type* | *Size* | *Values* |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectDeviceParent}% |
 | Name | text  | 80 | %BASETOPIC% |
 | Vlan Name | text | 80 | |
 | Vlan tag | text  | 4 | |
 | Description | text | 80 | |
-| Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 
 -- Main.RomanDmitriev - 2020/10/12

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

@@ -8,20 +8,20 @@ This is a topic, used for create network device
 | *Name*  | *Type* | *Size* | *Values* |
 | Device Type | text | 10 | VoipGate |
 | Name | text  | 80 | %BASETOPIC% |
-| Place | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
-| ATS | select+multi | 2 | , %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Place | select | 1 | %INCLUDE{IncludeSelectPlace}% |
+| ATS | select+multi | 2 | %INCLUDE{IncludeSelectATS}% |
 | Phone Number | text | 30 | |
 | Dns Name | text  | 80 | |
 | Description | text | 80 | |
-| Vendor | select | 1 | %DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }% |
+| Vendor | select | 1 | %INCLUDE{IncludeSelectVendor}% |
 | Device Model | text | 80 | |
 | Firmware | text | 100 | |
 | Community | text | 20 | |
 | SN | text | 80 | |
 | Uplink | text | 20 | |
-| Parent | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% |
+| Parent | select | 1 | %INCLUDE{IncludeSelectNetParent}% |
 | Parent Port | text | 20 | |
-| Device Subnet | select | 1 | , %SEARCH{"\.*"  scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Device Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Device IP | text | 20 | |
 | Mac | text | 20 | |
 | Disabled | checkbox | 1 |  Yes |

+ 2 - 2
docs/wiki/foswiki/data/FormWirelessProfile.txt

@@ -3,9 +3,9 @@
 | Name | text | 20 | %BASETOPIC% |
 | Wireless SSID | text | 20 | |
 | Vlan | text | 4 | |
-| Subnet | select | 1 | , %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}% |
+| Subnet | select | 1 | %INCLUDE{IncludeSelectSubnet}% |
 | Description | text | 80 | |
-| Wireless PSK | select | 1 | , %SEARCH{search="\.*" scope="topic" topic="AuthWirelessPSK*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}% |
+| Wireless PSK | select | 1 | %INCLUDE{IncludeSelectWirelessPSK}% |
 | Disabled | checkbox | 1 |  Yes |
 | Deleted | checkbox | 1 |  Yes |
 

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="DeviceATS*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Building*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Gateway*,Site*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Cluster*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Cluster*,Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

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

@@ -0,0 +1 @@
+ , %SEARCH{"\.*" scope="topic" topic="Server*,Router*,Switch*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}% 

+ 20 - 0
docs/wiki/foswiki/data/IncludeSelectDeviceType.txt

@@ -0,0 +1,20 @@
+AP,
+ATS,
+Computer,
+CPO,
+Gateway,
+Hardware,
+IPCAM,
+KvmHost,
+Phone,
+Printer,
+Projector,
+Router,
+Sensor,
+Server,
+Switch,
+UPS,
+VideoRegistrator,
+VoipGate,
+VoipPhone,
+WLAC

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="DhcpPool*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Dns*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+ , %SEARCH{search="\.*" scope="topic" topic="Domain*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+Ethernet=eth, Wifi 2.4G=wifi4, Wifi 5G=wifi5

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Hardware*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

+ 21 - 0
docs/wiki/foswiki/data/IncludeSelectKvmHostParent.txt

@@ -0,0 +1,21 @@
+, %SEARCH{
+"lc(DeviceType)='kvmhost' and VirtualCluster=''"
+type="query"
+nosearch="on"
+nototal="on"
+format="$topic"
+separator=", "
+order="formfield(Name)"
+}%
+, %SEARCH{
+"\.*"
+scope="topic"
+topic="Cluster*"
+nototal="on"
+nosummary="on"
+nosearch="on"
+regex="on"
+format="$topic"
+separator=", "
+order="formfield(Name)"
+}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Ups*,Device*,Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Switch*,Router*,Gateway*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

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

@@ -0,0 +1 @@
+Windows 2003, Windows 2008, Windows 2012, Windows 2016, Windows XP, Windows Vista, Windows 7, Windows 8, Windows 10, Centos 5, Centos 6, Centos 7, Centos 8, Ubuntu 14, Ubuntu 16, Ubuntu 18, Ubuntu 20, Debian 9, Debian 10, Linux, Windows

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Building*,Room*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+Нет, Passive, 802.3af, 802.3at, 802.3af/at, VendorFantasy

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

@@ -0,0 +1 @@
+, %SEARCH{scope="topic" topic="Rack*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}%

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

@@ -0,0 +1 @@
+, %SEARCH{scope="topic" topic="Room*" nototal="on" nosummary="on" nosearch="on" type="query" format="$topic" separator=", " order="formfield(Parent)"}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="WirelessProfile*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(WirelessSSID)"}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Vmware*,Server*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

+ 2 - 0
docs/wiki/foswiki/data/IncludeSelectServiceType.txt

@@ -0,0 +1,2 @@
+DNS,DHCP,HTTP,TFTP,NTP,SMTP,POP3,IMAP,SSH,Openvpn,Nagios,MySQL,PostgreSQL,Radius,Ldap,Fprobe,NFS,Nfcapd,Samba,Ftp,RsyncD,SSH,
+Elasticsearch,Graylog,Syslog,Rsyslog,Syslog-ng,MongoDB,Coturn,Kannel,Smsd,Vlc,ffmpeg,Other

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="Subnet-*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Subnet)"}%

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

@@ -0,0 +1 @@
+%DATABASE_SQL{description="stat" sql="SELECT name FROM vendors ORDER BY name" format=" $name," }%

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

@@ -0,0 +1 @@
+ , %SEARCH{"\.*" topic="DeviceVideoReg*" scope="topic" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(DnsName)"}%

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

@@ -0,0 +1 @@
+Virtual KVM, Virtual OpenVZ, Virtual Docker, Virtual ESXi

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="DeviceVoipGate*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%

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

@@ -0,0 +1 @@
+, %SEARCH{"\.*" scope="topic" topic="WirelessController*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", " order="formfield(Name)"}%

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

@@ -0,0 +1 @@
+, %SEARCH{search="\.*" scope="topic" topic="AuthWirelessPSK*" nototal="on" nosummary="on" nosearch="on" regex="on" format="$topic" separator=", "}%