Skip to content

Commit d3ce4bd

Browse files
rudnerbjoernrudnerbjoern
authored
Merge pull request #8 from rudnerbjoern/dev
Compatibility with iTop 3.1
2 parents 883d2f6 + f92fbd1 commit d3ce4bd

15 files changed

+366
-111
lines changed

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ Adds monitor, docking station, keyboard, mouse, headset
99

1010
## Dependencies
1111

12-
* iTop End-User Devices (itop-endusers-devices/2.7.5) needs to be enabled during setup
12+
* iTop End-User Devices (itop-endusers-devices) needs to be enabled during setup
13+
14+
## iTop Compatibility
15+
16+
The extension was tested on iTop 2.7.11 and 3.1.1
1317

1418
## Attribution
1519

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,5 +187,61 @@
187187
</search>
188188
</presentation>
189189
</class>
190+
<class id="MobilePhone" _delta="if_exists">
191+
<presentation>
192+
<details>
193+
<items>
194+
<item id="costcenter_id" _delta="delete" />
195+
<item id="col:col2" _delta="must_exist">
196+
<items>
197+
<item id="fieldset:Server:otherinfo" _delta="must_exist">
198+
<items>
199+
<item id="costcenter_id" _delta="define">
200+
<rank>5</rank>
201+
</item>
202+
</items>
203+
</item>
204+
</items>
205+
</item>
206+
</items>
207+
</details>
208+
<search>
209+
<items>
210+
<item id="costcenter_id" _delta="delete" />
211+
<item id="costcenter_id" _delta="define">
212+
<rank>160</rank>
213+
</item>
214+
</items>
215+
</search>
216+
</presentation>
217+
</class>
218+
<class id="IPPhone" _delta="if_exists">
219+
<presentation>
220+
<details>
221+
<items>
222+
<item id="costcenter_id" _delta="delete" />
223+
<item id="col:col2" _delta="must_exist">
224+
<items>
225+
<item id="fieldset:Server:otherinfo" _delta="must_exist">
226+
<items>
227+
<item id="costcenter_id" _delta="define">
228+
<rank>5</rank>
229+
</item>
230+
</items>
231+
</item>
232+
</items>
233+
</item>
234+
</items>
235+
</details>
236+
<search>
237+
<items>
238+
<item id="costcenter_id" _delta="delete" />
239+
<item id="costcenter_id" _delta="define">
240+
<rank>140</rank>
241+
</item>
242+
</items>
243+
</search>
244+
</presentation>
245+
</class>
190246
</classes>
191247
</itop_design>

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

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

1111
SetupWebPage::AddModule(
1212
__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
13-
'br-costcenter-bridge-for-br-peripherals/0.6.0',
13+
'br-costcenter-bridge-for-br-peripherals/0.7.0',
1414
array(
1515
// Identification
1616
'label' => 'Bridge - Costcenter + Periperals',
1717
'category' => 'business',
1818

1919
// Setup
2020
'dependencies' => array(
21-
'br-costcenter/0.1.0',
22-
'br-peripherals/0.6.0',
21+
'br-costcenter/0.4.0',
22+
'br-peripherals/0.7.0',
2323
),
2424
'mandatory' => false,
2525
'visible' => true, // To prevent auto-install but shall not be listed in the install wizard
2626
'auto_select' => 'SetupInfo::ModuleIsSelected("br-costcenter") && SetupInfo::ModuleIsSelected("br-peripherals")',
2727

2828
// Components
29-
'datamodel' => array(
30-
'model.br-costcenter-bridge-for-br-peripherals.php'
31-
),
29+
'datamodel' => array(),
3230
'webservice' => array(),
3331
'dictionary' => array(),
3432
'data.struct' => array(),

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

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,5 +91,53 @@
9191
</search>
9292
</presentation>
9393
</class>
94+
<class id="MobilePhone" _delta="if_exists">
95+
<presentation>
96+
<details>
97+
<items>
98+
<item id="macaddress" _delta="delete" />
99+
<item id="ipaddress_id" _delta="delete" />
100+
<item id="col:col1">
101+
<items>
102+
<item id="fieldset:Server:moreinfo">
103+
<items>
104+
<item id="macaddress" _delta="define">
105+
<rank>61</rank>
106+
</item>
107+
<item id="ipaddress_id" _delta="define">
108+
<rank>62</rank>
109+
</item>
110+
</items>
111+
</item>
112+
</items>
113+
</item>
114+
</items>
115+
</details>
116+
</presentation>
117+
</class>
118+
<class id="IPPhone" _delta="if_exists">
119+
<presentation>
120+
<details>
121+
<items>
122+
<item id="macaddress" _delta="delete" />
123+
<item id="ipaddress_id" _delta="delete" />
124+
<item id="col:col1">
125+
<items>
126+
<item id="fieldset:Server:moreinfo">
127+
<items>
128+
<item id="macaddress" _delta="define">
129+
<rank>61</rank>
130+
</item>
131+
<item id="ipaddress_id" _delta="define">
132+
<rank>62</rank>
133+
</item>
134+
</items>
135+
</item>
136+
</items>
137+
</item>
138+
</items>
139+
</details>
140+
</presentation>
141+
</class>
94142
</classes>
95143
</itop_design>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @copyright Copyright (C) 2024 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2024-08-16
6+
* @version 2024-08-27
77
*
88
* Localized data
99
*/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* @copyright Copyright (C) 2024 Björn Rudner
55
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
6-
* @version 2024-08-16
6+
* @version 2024-08-27
77
*
88
* Localized data
99
*/

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

Lines changed: 0 additions & 22 deletions
This file was deleted.

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

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

1111
SetupWebPage::AddModule(
1212
__FILE__,
13-
'br-peripherals-bridge-for-teemip-ip-mgmt/0.6.0',
13+
'br-peripherals-bridge-for-teemip-ip-mgmt/0.7.0',
1414
array(
1515
// Identification
1616
//
@@ -23,17 +23,15 @@
2323
'itop-endusers-devices/2.7.0',
2424
'teemip-ip-mgmt/3.0.1',
2525
'teemip-config-mgmt-adaptor/3.0.1',
26-
'br-peripherals/0.6.0',
26+
'br-peripherals/0.7.0',
2727
),
2828
'mandatory' => false,
2929
'visible' => true, // To prevent auto-install but shall not be listed in the install wizard
3030
'auto_select' => 'SetupInfo::ModuleIsSelected("itop-endusers-devices") && SetupInfo::ModuleIsSelected("teemip-ip-mgmt") && SetupInfo::ModuleIsSelected("teemip-config-mgmt-adaptor") && SetupInfo::ModuleIsSelected("br-peripherals")',
3131

3232
// Components
3333
//
34-
'datamodel' => array(
35-
'model.br-peripherals-bridge-for-teemip-ip-mgmt.php'
36-
),
34+
'datamodel' => array(),
3735
'data.struct' => array(),
3836
'data.sample' => array(),
3937

0 commit comments

Comments
 (0)