Skip to content

Commit ad3e01e

Browse files
rudnerbjoernrudnerbjoern
authored
Merge pull request #28 from rudnerbjoern/dev
set compatibility to iTop 3.2
2 parents 432d96b + 267c710 commit ad3e01e

13 files changed

+37
-35
lines changed

‎.vscode/settings.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
"fieldset",
1717
"friendlyname",
1818
"functionalci",
19+
"Golubev",
1920
"imei",
2021
"ipphone",
2122
"isset",
@@ -32,6 +33,8 @@
3233
"printerscanner",
3334
"providercontracts",
3435
"serialnumber",
35-
"teemip"
36+
"surang",
37+
"teemip",
38+
"xnimrodx"
3639
]
3740
}

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -505,9 +505,9 @@ The class `ConferenceSystem` is a child class of `TelephonyCI`.
505505

506506
The branch [2.7.10](https://github.com/rudnerbjoern/iTop-br-peripherals/tree/itop/2.7) is compatible to iTop 2.7 and iTop 3.1.
507507

508-
The branch [main](https://github.com/rudnerbjoern/iTop-br-peripherals/tree/main) will only be compatible to iTop 3.1 and above.
508+
The branch [main](https://github.com/rudnerbjoern/iTop-br-peripherals/tree/main) will only be compatible to iTop 3.2 and above.
509509

510-
The extension was tested on iTop 2.7.10, 3.1.1 and 3.2.1.
510+
The extension was tested on iTop 2.7.10 and 3.2.1.
511511

512512
## Attribution
513513

‎br-costcenter-bridge-for-br-peripherals/datamodel.br-costcenter-bridge-for-br-peripherals.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml-model href="https://raw.githubusercontent.com/rudnerbjoern/iTop-schema/refs/heads/main/3.2/itop_design.xsd"?>
3-
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
2+
<itop_design version="3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/rudnerbjoern/iTop-schema/refs/heads/main/3.2/itop_design.xsd">
43
<!--
5-
* @copyright Copyright (C) 2024 Björn Rudner
4+
* @copyright Copyright (C) 2024-2025 Björn Rudner
65
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
76
-->
87
<classes>

‎br-costcenter-bridge-for-br-peripherals/module.br-costcenter-bridge-for-br-peripherals.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
/**
44
* @copyright Copyright (C) 2024-2025 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2025-06-11
6+
* @version 2025-06-12
77
*
88
* iTop module definition file
99
*/
1010

1111
/** @disregard P1009 Undefined type SetupWebPage */
1212
SetupWebPage::AddModule(
1313
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
14-
'br-costcenter-bridge-for-br-peripherals/3.1.12',
14+
'br-costcenter-bridge-for-br-peripherals/3.2.0',
1515
array(
1616
// Identification
1717
'label' => 'Bridge - Costcenter + Peripherals',
1818
'category' => 'business',
1919

2020
// Setup
2121
'dependencies' => array(
22-
'br-peripherals/3.1.12||br-costcenter/3.1.6',
23-
'br-peripherals/3.1.12',
22+
'br-peripherals/3.2.0||br-costcenter/3.2.0',
23+
'br-peripherals/3.2.0',
2424
),
2525
'mandatory' => false,
2626
'visible' => true, // To prevent auto-install but shall not be listed in the install wizard

‎br-peripherals-bridge-for-teemip-ip-mgmt/datamodel.br-peripherals-bridge-for-teemip-ip-mgmt.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml-model href="https://raw.githubusercontent.com/rudnerbjoern/iTop-schema/refs/heads/main/3.2/itop_design.xsd"?>
3-
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
2+
<itop_design version="3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/rudnerbjoern/iTop-schema/refs/heads/main/3.2/itop_design.xsd">
43
<!--
5-
* @copyright Copyright (C) 2024 Björn Rudner
4+
* @copyright Copyright (C) 2024-2025 Björn Rudner
65
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
76
-->
87
<classes>

‎br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/de.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?php
22

33
/**
4-
* @copyright Copyright (C) 2024 Björn Rudner
4+
* @copyright Copyright (C) 2024-2025 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2024-09-05
6+
* @version 2025-06-12
77
*
88
* Localized data
99
*/
1010

11+
/** @disregard P1009 Undefined type Dict */
1112
Dict::Add('DE DE', 'German', 'Deutsch', array(
1213
'Class:DockingStation/Attribute:macaddress' => 'MAC Adresse',
1314
'Class:DockingStation/Attribute:macaddress+' => '',

‎br-peripherals-bridge-for-teemip-ip-mgmt/dictionaries/en.dict.br-peripherals-bridge-for-teemip-ip-mgmt.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<?php
22

33
/**
4-
* @copyright Copyright (C) 2024 Björn Rudner
4+
* @copyright Copyright (C) 2024-2025 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2024-09-05
6+
* @version 2025-06-12
77
*
88
* Localized data
99
*/
1010

11+
/** @disregard P1009 Undefined type Dict */
1112
Dict::Add('EN US', 'English', 'English', array(
1213
'Class:DockingStation/Attribute:macaddress' => 'MAC Address',
1314
'Class:DockingStation/Attribute:macaddress+' => '',

‎br-peripherals-bridge-for-teemip-ip-mgmt/module.br-peripherals-bridge-for-teemip-ip-mgmt.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
/**
44
* @copyright Copyright (C) 2024-2025 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2025-06-11
6+
* @version 2025-06-12
77
*
88
* iTop module definition file
99
*/
1010

1111
/** @disregard P1009 Undefined type SetupWebPage */
1212
SetupWebPage::AddModule(
1313
__FILE__,
14-
'br-peripherals-bridge-for-teemip-ip-mgmt/3.1.12',
14+
'br-peripherals-bridge-for-teemip-ip-mgmt/3.2.0',
1515
array(
1616
// Identification
1717
//
@@ -21,9 +21,9 @@
2121
// Setup
2222
//
2323
'dependencies' => array(
24-
'br-peripherals/3.1.12||teemip-ip-mgmt/3.0.0',
25-
'br-peripherals/3.1.12||teemip-config-mgmt-adaptor/3.0.0',
26-
'br-peripherals/3.1.12',
24+
'br-peripherals/3.2.0||teemip-ip-mgmt/3.0.0',
25+
'br-peripherals/3.2.0||teemip-config-mgmt-adaptor/3.0.0',
26+
'br-peripherals/3.2.0',
2727
),
2828
'mandatory' => false,
2929
'visible' => true, // To prevent auto-install but shall not be listed in the install wizard

‎br-peripherals/datamodel.br-peripherals.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<?xml-model href="https://raw.githubusercontent.com/rudnerbjoern/iTop-schema/refs/heads/main/3.2/itop_design.xsd"?>
3-
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
2+
<itop_design version="3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/rudnerbjoern/iTop-schema/refs/heads/main/3.2/itop_design.xsd">
43
<!--
5-
* @copyright Copyright (C) 2024 Björn Rudner
4+
* @copyright Copyright (C) 2024-2025 Björn Rudner
65
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
76
-->
87
<classes>

‎br-peripherals/dictionaries/de.dict.br-peripherals.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?php
22

33
/**
4-
* @copyright Copyright (C) 2024 Björn Rudner
4+
* @copyright Copyright (C) 2024-2025 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2024-10-18
6+
* @version 2025-06-12
77
*
88
* Localized data
99
*/

0 commit comments

Comments
 (0)