Skip to content

Commit

Permalink
Merge pull request #8 from rudnerbjoern/dev
Browse files Browse the repository at this point in the history 
Compatibility with iTop 3.1
  • Loading branch information
@rudnerbjoern
rudnerbjoern authored Aug 27, 2024
2 parents 883d2f6 + f92fbd1 commit d3ce4bd
Show file tree
Hide file tree
Showing 15 changed files with 366 additions and 111 deletions.
6 changes: 5 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ Adds monitor, docking station, keyboard, mouse, headset

## Dependencies

* iTop End-User Devices (itop-endusers-devices/2.7.5) needs to be enabled during setup
* iTop End-User Devices (itop-endusers-devices) needs to be enabled during setup

## iTop Compatibility

The extension was tested on iTop 2.7.11 and 3.1.1

## Attribution

Expand Down
56 changes: 56 additions & 0 deletions ...ostcenter-bridge-for-br-peripherals/datamodel.br-costcenter-bridge-for-br-peripherals.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,5 +187,61 @@
</search>
</presentation>
</class>
<class id="MobilePhone" _delta="if_exists">
<presentation>
<details>
<items>
<item id="costcenter_id" _delta="delete" />
<item id="col:col2" _delta="must_exist">
<items>
<item id="fieldset:Server:otherinfo" _delta="must_exist">
<items>
<item id="costcenter_id" _delta="define">
<rank>5</rank>
</item>
</items>
</item>
</items>
</item>
</items>
</details>
<search>
<items>
<item id="costcenter_id" _delta="delete" />
<item id="costcenter_id" _delta="define">
<rank>160</rank>
</item>
</items>
</search>
</presentation>
</class>
<class id="IPPhone" _delta="if_exists">
<presentation>
<details>
<items>
<item id="costcenter_id" _delta="delete" />
<item id="col:col2" _delta="must_exist">
<items>
<item id="fieldset:Server:otherinfo" _delta="must_exist">
<items>
<item id="costcenter_id" _delta="define">
<rank>5</rank>
</item>
</items>
</item>
</items>
</item>
</items>
</details>
<search>
<items>
<item id="costcenter_id" _delta="delete" />
<item id="costcenter_id" _delta="define">
<rank>140</rank>
</item>
</items>
</search>
</presentation>
</class>
</classes>
</itop_design>
22 changes: 0 additions & 22 deletions br-costcenter-bridge-for-br-peripherals/model.br-costcenter-bridge-for-br-peripherals.php
View file

This file was deleted.

12 changes: 5 additions & 7 deletions br-costcenter-bridge-for-br-peripherals/module.br-costcenter-bridge-for-br-peripherals.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,30 @@
/**
* @copyright Copyright (C) 2024 Björn Rudner
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
* @version 2024-08-16
* @version 2024-08-27
*
* iTop module definition file
*/

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

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

// Components
'datamodel' => array(
'model.br-costcenter-bridge-for-br-peripherals.php'
),
'datamodel' => array(),
'webservice' => array(),
'dictionary' => array(),
'data.struct' => array(),
Expand Down
48 changes: 48 additions & 0 deletions ...ipherals-bridge-for-teemip-ip-mgmt/datamodel.br-peripherals-bridge-for-teemip-ip-mgmt.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,53 @@
</search>
</presentation>
</class>
<class id="MobilePhone" _delta="if_exists">
<presentation>
<details>
<items>
<item id="macaddress" _delta="delete" />
<item id="ipaddress_id" _delta="delete" />
<item id="col:col1">
<items>
<item id="fieldset:Server:moreinfo">
<items>
<item id="macaddress" _delta="define">
<rank>61</rank>
</item>
<item id="ipaddress_id" _delta="define">
<rank>62</rank>
</item>
</items>
</item>
</items>
</item>
</items>
</details>
</presentation>
</class>
<class id="IPPhone" _delta="if_exists">
<presentation>
<details>
<items>
<item id="macaddress" _delta="delete" />
<item id="ipaddress_id" _delta="delete" />
<item id="col:col1">
<items>
<item id="fieldset:Server:moreinfo">
<items>
<item id="macaddress" _delta="define">
<rank>61</rank>
</item>
<item id="ipaddress_id" _delta="define">
<rank>62</rank>
</item>
</items>
</item>
</items>
</item>
</items>
</details>
</presentation>
</class>
</classes>
</itop_design>
2 changes: 1 addition & 1 deletion ...peripherals-bridge-for-teemip-ip-mgmt.php → ...peripherals-bridge-for-teemip-ip-mgmt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @copyright Copyright (C) 2024 Björn Rudner
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
* @version 2024-08-16
* @version 2024-08-27
*
* Localized data
*/
Expand Down
2 changes: 1 addition & 1 deletion ...peripherals-bridge-for-teemip-ip-mgmt.php → ...peripherals-bridge-for-teemip-ip-mgmt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @copyright Copyright (C) 2024 Björn Rudner
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
* @version 2024-08-16
* @version 2024-08-27
*
* Localized data
*/
Expand Down
22 changes: 0 additions & 22 deletions br-peripherals-bridge-for-teemip-ip-mgmt/model.br-peripherals-bridge-for-teemip-ip-mgmt.php
View file

This file was deleted.

10 changes: 4 additions & 6 deletions br-peripherals-bridge-for-teemip-ip-mgmt/module.br-peripherals-bridge-for-teemip-ip-mgmt.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
/**
* @copyright Copyright (C) 2024 Björn Rudner
* @license https://www.gnu.org/licenses/gpl-3.0.en.html
* @version 2024-08-16
* @version 2024-08-27
*
* iTop module definition file
*/

SetupWebPage::AddModule(
__FILE__,
'br-peripherals-bridge-for-teemip-ip-mgmt/0.6.0',
'br-peripherals-bridge-for-teemip-ip-mgmt/0.7.0',
array(
// Identification
//
Expand All @@ -23,17 +23,15 @@
'itop-endusers-devices/2.7.0',
'teemip-ip-mgmt/3.0.1',
'teemip-config-mgmt-adaptor/3.0.1',
'br-peripherals/0.6.0',
'br-peripherals/0.7.0',
),
'mandatory' => false,
'visible' => true, // To prevent auto-install but shall not be listed in the install wizard
'auto_select' => 'SetupInfo::ModuleIsSelected("itop-endusers-devices") && SetupInfo::ModuleIsSelected("teemip-ip-mgmt") && SetupInfo::ModuleIsSelected("teemip-config-mgmt-adaptor") && SetupInfo::ModuleIsSelected("br-peripherals")',

// Components
//
'datamodel' => array(
'model.br-peripherals-bridge-for-teemip-ip-mgmt.php'
),
'datamodel' => array(),
'data.struct' => array(),
'data.sample' => array(),

Expand Down
Loading

0 comments on commit d3ce4bd

Please sign in to comment.