diff --git a/business/templates/welcome_menu.html b/business/templates/welcome_menu.html index f469524d1..5e6b8e506 100644 --- a/business/templates/welcome_menu.html +++ b/business/templates/welcome_menu.html @@ -29,24 +29,24 @@ display: list-item;

- - diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 7c2c98d0a..7f1c01566 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -14,7 +14,7 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -define('ITOP_VERSION', '0.9'); +define('ITOP_VERSION', '1.0 beta'); define('ITOP_REVISION', '$WCREV$'); define('ITOP_BUILD_DATE', '$WCNOW$'); diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index a2d7b7875..e6e7d1eb3 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/dictionaries/dictionary.itop.ui.php @@ -329,8 +329,8 @@ Dict::Add('EN US', 'English', 'English', array(

', - 'UI:WelcomeMenu:MyCalls' => 'My Service Calls', - 'UI:WelcomeMenu:MyIncidents' => 'My Incidents', + 'UI:WelcomeMenu:MyCalls' => 'User Requests assigned to me', + 'UI:WelcomeMenu:MyIncidents' => 'Incidents assigned to me', 'UI:AllOrganizations' => ' All Organizations ', 'UI:YourSearch' => 'Your Search', 'UI:LoggedAsMessage' => 'Logged in as %1$s', @@ -722,6 +722,29 @@ Dict::Add('EN US', 'English', 'English', array( 'UI:ConfigurationManagementMenu:Title' => 'Infrastructure Overview', 'UI-ConfigurationManagementMenu-InfraByType' => 'Infrastructure objects by type', 'UI-ConfigurationManagementMenu-InfraByStatus' => 'Infrastructure objects by status', + +'UI:ConfigMgmtMenuOverview:Title' => 'Dashboard for Configuration Management', +'UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus' => 'Configuration Items by status', +'UI-ConfigMgmtMenuOverview-FunctionalCIByType' => 'Configuration Items by type', + +'UI:RequestMgmtMenuOverview:Title' => 'Dashboard for Request Management', +'UI-RequestManagementOverview-RequestByService' => 'User Requests by service', +'UI-RequestManagementOverview-RequestByPriority' => 'User Requests by priority', +'UI-RequestManagementOverview-RequestUnassigned' => 'User Requests not yet assigned to an agent', + +'UI:IncidentMgmtMenuOverview:Title' => 'Dashboard for Incident Management', +'UI-IncidentManagementOverview-IncidentByService' => 'Incidents by service', +'UI-IncidentManagementOverview-IncidentByPriority' => 'Incident by priority', +'UI-IncidentManagementOverview-IncidentUnassigned' => 'Incidents not yet assigned to an agent', + +'UI:ChangeMgmtMenuOverview:Title' => 'Dashboard for Change Management', +'UI-ChangeManagementOverview-ChangeByType' => 'Changes by type', +'UI-ChangeManagementOverview-ChangeUnassigned' => 'Changes not yet assigned to an agent', +'UI-ChangeManagementOverview-ChangeWithOutage' => 'Outages due to changes', + +'UI:ServiceMgmtMenuOverview:Title' => 'Dashboard for Service Management', +'UI-ServiceManagementOverview-CustomerContractToRenew' => 'Customer contracts to be renewed in 30 days', +'UI-ServiceManagementOverview-ProviderContractToRenew' => 'Provider contracts to be renewed in 30 days', 'UI:ContactsMenu' => 'Contacts', 'UI:ContactsMenu+' => 'Contacts', diff --git a/images/welcome.jpg b/images/welcome.jpg index 5eedefc4b..c15aa1b92 100644 Binary files a/images/welcome.jpg and b/images/welcome.jpg differ diff --git a/modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php b/modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php index af618c58f..873d41ae9 100644 --- a/modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php +++ b/modules/itop-change-mgmt-1.0.0/module.itop-change-mgmt.php @@ -36,8 +36,8 @@ SetupWebPage::AddModule( // Documentation // - 'doc.manual_setup' => '/doc/xxx/yyy.htm', - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.manual_setup' => '', + 'doc.more_information' => '/doc/itop-documentation.htm#ChangeMgmt', ) ); diff --git a/modules/itop-change-mgmt-1.0.0/overview.html b/modules/itop-change-mgmt-1.0.0/overview.html new file mode 100644 index 000000000..17c8622bf --- /dev/null +++ b/modules/itop-change-mgmt-1.0.0/overview.html @@ -0,0 +1,22 @@ +

UI:ChangeMgmtMenuOverview:Title

+
+ UI:WelcomeMenu:LeftBlock + UI:WelcomeMenu:RightBlock
- +

UI:WelcomeMenu:MyCalls

-SELECT ServiceCall AS i WHERE i.caller_id = :current_contact_id +SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id 		- +

UI:WelcomeMenu:MyIncidents

-SELECT IncidentTicket AS i WHERE i.caller_id = :current_contact_id +SELECT Incident AS i WHERE i.caller_id = :current_contact_id
+ + + + + + + + +
+SELECT Change + +

UI-ChangeManagementOverview-ChangeUnassigned

+SELECT Change WHERE status = 'new' +
+

UI-ChangeManagementOverview-ChangeWithOutage

+SELECT Change WHERE outage = 'yes' +		 +  +
+ diff --git a/modules/itop-config-mgmt-1.0.0/cis_menu.html b/modules/itop-config-mgmt-1.0.0/cis_menu.html new file mode 100644 index 000000000..22b7d4ad0 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/cis_menu.html @@ -0,0 +1,20 @@ +

UI:ConfigurationManagementMenu:Title

+ + + + + + + + + +
+SELECT FunctionalCI + +SELECT FunctionalCI +
+

UI-ConfigurationManagementMenu-InfraByType

+SELECT FunctionalCI +		 +  +
diff --git a/modules/itop-config-mgmt-1.0.0/contacts_menu.html b/modules/itop-config-mgmt-1.0.0/contacts_menu.html new file mode 100644 index 000000000..267a9c438 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/contacts_menu.html @@ -0,0 +1,22 @@ +

UI:ContactsMenu:Title

+ + + + + + + + + +
+

UI-ContactsMenu-ContactsByLocation

+SELECT Contact +		 +SELECT Contact +
+

UI-ContactsMenu-ContactsByType

+SELECT Contact +		 +

UI-ContactsMenu-ContactsByStatus

+SELECT Contact +
diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml b/modules/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml new file mode 100644 index 000000000..49cd48105 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.ApplicationInstance.xml @@ -0,0 +1,25 @@ + + + +Apache web server +production +2 +medium +9 +0 +1 +2.2 + + + +Tomcat +production +2 +medium +9 +0 +2 + + + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml b/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml new file mode 100644 index 000000000..1ca5acd0e --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.Contact.xml @@ -0,0 +1,29 @@ + + + +Dali +active +2 +salvador@combodo.com + +3 +Salvador + + + +Hardware support +active +2 +support@combodo.com + +2 + + +NW support +active +2 +nw@company.com + +3 + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml b/modules/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml new file mode 100644 index 000000000..296c65c62 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.DBServerInstance.xml @@ -0,0 +1,14 @@ + + + +MySql server +implementation +2 +medium +2 +0 +3 +5.0.27 + + + diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml b/modules/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml new file mode 100644 index 000000000..cd1558a62 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.DatabaseInstance.xml @@ -0,0 +1,11 @@ + + + +itop-alpha +implementation +2 +medium +7 +database instance for iTop application + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml b/modules/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml new file mode 100644 index 000000000..b2dc6ede8 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.FunctionalCI.xml @@ -0,0 +1,97 @@ + + + +dbserver1.demo.com +production +2 +medium +HP +DL380 + + + +3 + +10.1.1.10 +255.255.255.0 +2 +16Gb +120Gb +Linux +Debian (Lenny) + + +iTop +production +2 +medium +iTop application for IT Management + + +iTop Demonstration +production +2 +medium + + + +router1 +implementation +2 +medium + + + + + +0 + + + +router + + + + + + +switch01 +production +2 +medium +3Com +2300 + + + +2 + +10.1.1.2 +255.255.255.0 +switch + + + + + + +webserver.demo.com +production +2 +medium +IBM +x3400 Tower Server + + + +3 + +10.1.1.20 +255.255.255.0 +4 +8Gb +240Gb +Unix +AIX 4.0 + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Location.xml b/modules/itop-config-mgmt-1.0.0/data.sample.Location.xml new file mode 100644 index 000000000..5bca5e4be --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.Location.xml @@ -0,0 +1,23 @@ + + + +Grenoble +active +2 +
24, rue Lamartine
+38320 +Eybens +France +0 + + +Paris +active +2 +
5, rue du Sentier
+75002 +Paris +Franche +0 + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml b/modules/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml new file mode 100644 index 000000000..cf6e42700 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.NetworkInterface.xml @@ -0,0 +1,103 @@ + + + +A0 +production +2 +medium + + + + +4 +primary +ethernet + + + + +full +3 +downlink + + +A1 +production +2 +medium + + + + +4 +primary +ethernet +10.1.1.2 +255.255.255.0 + + +full +0 +uplink + + +A2 +implementation +2 +medium + + + + +4 +primary +ethernet + + + + +full +14 +downlink + + +eth0 +implementation +2 +medium + + + + +2 +primary +ethernet +10.1.1.10 +255.255.255.0 +00:a2:23:b45:34 + +full +5 +uplink + + +eth0 +production +2 +medium + + + + +9 +primary +ethernet +10.1.1.20 +255.255.255.0 + + +full +13 +uplink + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.organization.xml b/modules/itop-config-mgmt-1.0.0/data.sample.Organization.xml similarity index 75% rename from modules/itop-config-mgmt-1.0.0/data.sample.organization.xml rename to modules/itop-config-mgmt-1.0.0/data.sample.Organization.xml index f6192d013..1069b3ee8 100644 --- a/modules/itop-config-mgmt-1.0.0/data.sample.organization.xml +++ b/modules/itop-config-mgmt-1.0.0/data.sample.Organization.xml @@ -1,9 +1,9 @@ -Demo company -DEMO +Demo + active 0 - + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.Software.xml b/modules/itop-config-mgmt-1.0.0/data.sample.Software.xml new file mode 100644 index 000000000..0dd660cc9 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.Software.xml @@ -0,0 +1,23 @@ + + + +Apache + + + +MySql + + + +Oracle + + + +Outlook Server + + + +Tomcat + + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.application.xml b/modules/itop-config-mgmt-1.0.0/data.sample.application.xml deleted file mode 100644 index 41448ab28..000000000 --- a/modules/itop-config-mgmt-1.0.0/data.sample.application.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - -Apache Web Server - - - -MySQL 5 -MySQL Server version 5 - - -Apache Web Server -production -2 -medium -4 -0 -2 -2.2 -Apache 2.2 with PHP 5.3.4 - - -MySQL 5 prod -production -2 -medium -1 -0 -1 -5.0.27 - - - -itop_beta -implementation -2 -medium -2 -iTop beta test instance - - -iTop demo -production -2 -high -Demo instance of iTop - - -6 -5 -itop beta instance - - -6 -3 -itop beta instance - - diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.business.xml b/modules/itop-config-mgmt-1.0.0/data.sample.business.xml deleted file mode 100644 index 208c1332f..000000000 --- a/modules/itop-config-mgmt-1.0.0/data.sample.business.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - -iTop demonstration -production -2 -medium -Demonstrating iTop on line - - -6 -7 -On demand demo of iTop - - -7 -3 -Operations Manager - - -7 -4 -Support Specialist - - diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.contact.xml b/modules/itop-config-mgmt-1.0.0/data.sample.contact.xml deleted file mode 100644 index e9a9d907d..000000000 --- a/modules/itop-config-mgmt-1.0.0/data.sample.contact.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - -Dumas -active -2 -alexandre.dumas@demo-noemail.net - -1 -Alexandre -20100002 - - -Hugo -active -2 -victor.hugo@demo-noemail.net - -1 -Victor -20100001 - - -Verne -active -2 -jules.verne@demo-noemail.net - -1 -Jules -20100003 - - -2 -4 - - -2 -5 - - \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml b/modules/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml new file mode 100644 index 000000000..cf1461167 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.lnkCIToContact.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml b/modules/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml new file mode 100644 index 000000000..45aac500e --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.lnkProcessToSolution.xml @@ -0,0 +1,8 @@ + + + +12 +15 +core application + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml b/modules/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml new file mode 100644 index 000000000..340ab99a9 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.lnkSolutionToCI.xml @@ -0,0 +1,18 @@ + + + +12 +10 + + + +12 +8 + + + +12 +11 + + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml b/modules/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml new file mode 100644 index 000000000..dce04fdff --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/data.sample.lnkTeamToContact.xml @@ -0,0 +1,13 @@ + + + +2 +1 +support agent + + +4 +3 +support agent + + \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.location.xml b/modules/itop-config-mgmt-1.0.0/data.sample.location.xml deleted file mode 100644 index 0aeae563e..000000000 --- a/modules/itop-config-mgmt-1.0.0/data.sample.location.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - -Headquarters -active -2 -
1, rue de la Paix
-75000 -Paris -France -0 - - \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.server.xml b/modules/itop-config-mgmt-1.0.0/data.sample.server.xml deleted file mode 100644 index 617085252..000000000 --- a/modules/itop-config-mgmt-1.0.0/data.sample.server.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - -dbserver1.demo.net -implementation -2 -medium -Hewlett-Packard -Proliant DL380 G5 -US0123421 -DEMO-2314 -Dedicated database server running MySQL -1 -Bottom of Rack 1 in DC -192.168.10.49 -192.168.10.254 -4 x 3GHz -8 GB -5 x 72 GB RAID 5 -Linux -Debian 5 (Lenny) - - -itop.demo.net -production -2 -high -Hewlet-Packard -Proliant DL380 G5 -US4123423 -DEMO-2321 -Web server for running the iTop demo -1 - -192.168.10.50 -192.168.10.254 -4 x 3GHz -8 GB -5 x 72 GB RAID 5 -Linux -Debian 5 (Lenny) - - diff --git a/modules/itop-config-mgmt-1.0.0/data.sample.team.xml b/modules/itop-config-mgmt-1.0.0/data.sample.team.xml deleted file mode 100644 index 4de908836..000000000 --- a/modules/itop-config-mgmt-1.0.0/data.sample.team.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - -Hardware Support Team -active -2 -pcsupport@demo-noemail.net - -1 - - \ No newline at end of file diff --git a/modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php index 5c3590df3..4b6de2b01 100644 --- a/modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php @@ -32,6 +32,9 @@ Dict::Add('EN US', 'English', 'English', array( 'Relation:impacts/Description' => 'Elements impacted by', 'Relation:impacts/VerbUp' => 'Impact...', 'Relation:impacts/VerbDown' => 'Elements impacted by...', + 'Relation:depends on/Description' => 'Elements this element depends on', + 'Relation:depends on/VerbUp' => 'Depends on...', + 'Relation:depends on/VerbDown' => 'Impacts...', )); diff --git a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php index 63617e06d..07ea5082f 100644 --- a/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php @@ -89,7 +89,7 @@ class Location extends cmdbAbstractObject MetaModel::Init_AddAttribute(new AttributeString("postal_code", array("allowed_values"=>null, "sql"=>"postal_code", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("city", array("allowed_values"=>null, "sql"=>"city", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("country", array("allowed_values"=>null, "sql"=>"country", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"Location", "jointype"=>null, "allowed_values"=>null, "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("parent_id", array("targetclass"=>"Location", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Location AS L WHERE L.org_id = :this->org_id'), "sql"=>"parent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("parent_name", array("allowed_values"=>null, "extkey_attcode"=>"parent_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeLinkedSet("contact_list", array("linked_class"=>"Contact", "ext_key_to_me"=>"location_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array()))); @@ -717,7 +717,7 @@ abstract class SoftwareInstance extends FunctionalCI MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>null, "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Device WHERE org_id = :this->org_id'), "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("device_name", array("allowed_values"=>null, "extkey_attcode"=>"device_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("licence_id", array("targetclass"=>"Licence", "jointype"=>null, "allowed_values"=>null, "sql"=>"licence_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("licence_name", array("allowed_values"=>null, "extkey_attcode"=>"licence_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); @@ -842,7 +842,7 @@ class DatabaseInstance extends FunctionalCI MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_AddAttribute(new AttributeExternalKey("db_server_instance_id", array("targetclass"=>"DBServerInstance", "jointype"=>null, "allowed_values"=>null, "sql"=>"db_server_instance_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("db_server_instance_id", array("targetclass"=>"DBServerInstance", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT DBServerInstance WHERE org_id = :this->org_id'), "sql"=>"db_server_instance_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("db_server_instance_name", array("allowed_values"=>null, "extkey_attcode"=>"db_server_instance_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("db_server_instance_version", array("allowed_values"=>null, "extkey_attcode"=>"db_server_instance_id", "target_attcode"=>"version", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeWikiText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); @@ -1022,7 +1022,7 @@ class NetworkInterface extends ConnectableCI MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>null, "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("device_id", array("targetclass"=>"Device", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Device WHERE org_id = :this->org_id'), "sql"=>"device_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("device_name", array("allowed_values"=>null, "extkey_attcode"=>"device_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("logical_type", array("allowed_values"=>new ValueSetEnum('backup,logical,port,primary,secondary'), "sql"=>"logical_type", "default_value"=>"primary", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("physical_type", array("allowed_values"=>new ValueSetEnum('atm,ethernet,framerelay,vlan'), "sql"=>"physical_type", "default_value"=>"ethernet", "is_null_allowed"=>false, "depends_on"=>array()))); @@ -1031,7 +1031,7 @@ class NetworkInterface extends ConnectableCI MetaModel::Init_AddAttribute(new AttributeString("mac_address", array("allowed_values"=>null, "sql"=>"mac_address", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeInteger("speed", array("allowed_values"=>null, "sql"=>"speed", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("duplex", array("allowed_values"=>new ValueSetEnum('full,half,unknown'), "sql"=>"duplex", "default_value"=>"full", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("connected_if", array("targetclass"=>"NetworkInterface", "jointype"=>null, "allowed_values"=>null, "sql"=>"connected_if", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("connected_if", array("targetclass"=>"NetworkInterface", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT NetworkInterface WHERE org_id = :this->org_id'), "sql"=>"connected_if", "is_null_allowed"=>true, "on_target_delete"=>DEL_AUTO, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("connected_name", array("allowed_values"=>null, "extkey_attcode"=>"connected_if", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("connected_if_device_id", array("allowed_values"=>null, "extkey_attcode"=>"connected_if", "target_attcode"=>"device_id", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("connected_if_device_id_name", array("allowed_values"=>null, "extkey_attcode"=>"connected_if", "target_attcode"=>"device_name", "is_null_allowed"=>true, "depends_on"=>array()))); @@ -1481,10 +1481,10 @@ new OQLMenuNode('DBServer', 'SELECT DBServer', $iTopology, 40 /* fRank */); $oConfigManagementGroup = new MenuGroup('ConfigManagement', 20 /* fRank */); // Create an entry, based on a custom template, for the Configuration management overview, under the top-level group -new TemplateMenuNode('ConfigManagementOverview', '../../modules/itop-config-mgmt-1.0.0/overview.html', $oConfigManagementGroup->GetIndex(), 0 /* fRank */); +new TemplateMenuNode('ConfigManagementOverview', '../modules/itop-config-mgmt-1.0.0/overview.html', $oConfigManagementGroup->GetIndex(), 0 /* fRank */); -$oContactNode = new TemplateMenuNode('Contact', '../../modules/itop-config-mgmt-1.0.0/contacts_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */); +$oContactNode = new TemplateMenuNode('Contact', '../modules/itop-config-mgmt-1.0.0/contacts_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */); new OQLMenuNode('Person', 'SELECT Person', $oContactNode->GetIndex(), 1 /* fRank */); new OQLMenuNode('Team', 'SELECT Team', $oContactNode->GetIndex(), 2 /* fRank */); diff --git a/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php b/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php index 75ca31d12..51f90dc91 100644 --- a/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php +++ b/modules/itop-config-mgmt-1.0.0/module.itop-config-mgmt.php @@ -30,19 +30,25 @@ SetupWebPage::AddModule( //'data.struct.itop-config-mgmt.xml', ), 'data.sample' => array( - 'data.sample.organization.xml', - 'data.sample.location.xml', - 'data.sample.team.xml', - 'data.sample.contact.xml', - 'data.sample.server.xml', - 'data.sample.application.xml', - 'data.sample.business.xml', + 'data.sample.Organization.xml', + 'data.sample.Location.xml', + 'data.sample.Software.xml', + 'data.sample.Contact.xml', + 'data.sample.lnkTeamToContact.xml', + 'data.sample.FunctionalCI.xml', + 'data.sample.DBServerInstance.xml', + 'data.sample.ApplicationInstance.xml', + 'data.sample.DatabaseInstance.xml', + //'data.sample.NetworkInterface.xml', + 'data.sample.lnkCIToContact.xml', + 'data.sample.lnkProcessToSolution.xml', + 'data.sample.lnkSolutionToCI.xml', ), // Documentation // 'doc.manual_setup' => '', // No manual installation required - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.more_information' => '/doc/itop-documentation.htm#ConfigMgmt', ) ); diff --git a/modules/itop-config-mgmt-1.0.0/overview.html b/modules/itop-config-mgmt-1.0.0/overview.html new file mode 100644 index 000000000..5de67c0b2 --- /dev/null +++ b/modules/itop-config-mgmt-1.0.0/overview.html @@ -0,0 +1,21 @@ +

UI:ConfigMgmtMenuOverview:Title

+ + + + + + + + +
+SELECT FunctionalCI + +SELECT FunctionalCI +
+

UI-ConfigMgmtMenuOverview-FunctionalCIByType

+SELECT FunctionalCI +		 +  +
+ + diff --git a/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php b/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php index 0aa24e0c9..0b8c78dce 100644 --- a/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php +++ b/modules/itop-incident-mgmt-1.0.0/module.itop-incident-mgmt.php @@ -37,8 +37,8 @@ SetupWebPage::AddModule( // Documentation // - 'doc.manual_setup' => '/doc/xxx/yyy.htm', - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.manual_setup' => '', + 'doc.more_information' => '/doc/itop-documentation.htm#IncidentMgmt', ) ); diff --git a/modules/itop-incident-mgmt-1.0.0/overview.html b/modules/itop-incident-mgmt-1.0.0/overview.html new file mode 100644 index 000000000..9d7fcbde7 --- /dev/null +++ b/modules/itop-incident-mgmt-1.0.0/overview.html @@ -0,0 +1,20 @@ +

UI:IncidentMgmtMenuOverview:Title

+ + + + + + + + + +
+SELECT Incident + +SELECT Incident +
+

UI-IncidentManagementOverview-IncidentUnassigned

+SELECT Incident WHERE status = 'new' +		 +
+ diff --git a/modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php b/modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php index 8a38f73a1..adb4a7628 100644 --- a/modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php +++ b/modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php @@ -37,7 +37,7 @@ SetupWebPage::AddModule( // Documentation // 'doc.manual_setup' => '', // No manual installation instructions - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.more_information' => '/doc/itop-documentation.htm#KnownErrorsDB', ) ); diff --git a/modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php b/modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php index ddd72f945..372fb18ba 100644 --- a/modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php +++ b/modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php @@ -37,7 +37,7 @@ SetupWebPage::AddModule( // Documentation // 'doc.manual_setup' => '', // No manual installation instructions - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.more_information' => '/doc/itop-documentation.htm#ProblemMgmt', ) ); diff --git a/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php b/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php index c108734c7..15cd7d8e5 100644 --- a/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php +++ b/modules/itop-request-mgmt-1.0.0/module.itop-request-mgmt.php @@ -36,8 +36,8 @@ SetupWebPage::AddModule( // Documentation // - 'doc.manual_setup' => '/doc/xxx/yyy.htm', - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.manual_setup' => '', + 'doc.more_information' => '/doc/itop-documentation.htm#RequestMgmt', ) ); diff --git a/modules/itop-request-mgmt-1.0.0/overview.html b/modules/itop-request-mgmt-1.0.0/overview.html new file mode 100644 index 000000000..32601fdb0 --- /dev/null +++ b/modules/itop-request-mgmt-1.0.0/overview.html @@ -0,0 +1,21 @@ +

UI:RequestMgmtMenuOverview:Title

+ + + + + + + + + +
+SELECT UserRequest + +SELECT UserRequest +
+

UI-RequestManagementOverview-RequestUnassigned

+SELECT UserRequest WHERE status = 'new' +		 +  +
+ diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml b/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml new file mode 100644 index 000000000..061917896 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.Contract.xml @@ -0,0 +1,29 @@ + + + +Hw Management + +2010-07-01 00:00:00 +2011-07-01 00:00:00 + +euros + + +2 +1 +2 + + +Nw Management + +2010-06-01 00:00:00 +2010-07-14 00:00:00 + +euros + + +2 +1 +4 + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.SLA.xml b/modules/itop-service-mgmt-1.0.0/data.sample.SLA.xml new file mode 100644 index 000000000..ea0d62356 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.SLA.xml @@ -0,0 +1,27 @@ + + + +Bronze - Service - HW Mgmt +1 + + +Bronze - Service - NW Mgmt +2 + + +Gold - Service - HW Mgmt +1 + + +Gold - Service - NW Mgmt +2 + + +Silver - Service - HW Mgmt +1 + + +Silver - Service - NW Mgmt +2 + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.SLT.xml b/modules/itop-service-mgmt-1.0.0/data.sample.SLT.xml new file mode 100644 index 000000000..ef060b820 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.SLT.xml @@ -0,0 +1,45 @@ + + + +TTO -15mn - Prio1 +TTO +1 +15 +minutes + + +TTO -30mn - Prio2 +TTO +2 +30 +minutes + + +TTO -4h - Prio3 +TTO +3 +4 +hours + + +TTR -2h - Prio1 +TTR +1 +2 +hours + + +TTR -4h - Prio2 +TTR +2 +4 +hours + + +TTR -8h- Prio3 +TTR +3 +8 +hours + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml b/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml new file mode 100644 index 000000000..cf1461167 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.Service.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml b/modules/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml new file mode 100644 index 000000000..b2b8e0a25 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.ServiceSubcategory.xml @@ -0,0 +1,13 @@ + + + +Break + +1 + + +Troubleshooting + +2 + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.contracttosla.xml b/modules/itop-service-mgmt-1.0.0/data.sample.contracttosla.xml deleted file mode 100644 index c126d5000..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.contracttosla.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - -2 -6 -8h-18h, business days - - \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.customercontract.xml b/modules/itop-service-mgmt-1.0.0/data.sample.customercontract.xml deleted file mode 100644 index d9fac7b16..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.customercontract.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - -End-User PC Support -Hardware support for end-users' PC -2010-07-01 -2012-07-31 - -euros - - -2 -2 - - diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml b/modules/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml new file mode 100644 index 000000000..2a6ac4c4c --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.lnkContractToSLA.xml @@ -0,0 +1,13 @@ + + + +2 +3 + + + +3 +6 + + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml b/modules/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml new file mode 100644 index 000000000..9c3988fe6 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/data.sample.lnkSLTToSLA.xml @@ -0,0 +1,51 @@ + + + +3 +2 + + +3 +5 + + +4 +3 + + +4 +6 + + +5 +1 + + +5 +4 + + +6 +2 + + +6 +5 + + +7 +3 + + +7 +6 + + +8 +1 + + +8 +4 + + \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.service.xml b/modules/itop-service-mgmt-1.0.0/data.sample.service.xml deleted file mode 100644 index 06dc72055..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.service.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - -NW Support -Network infrastructure support -IncidentManagement -production - - -PC Support -Hardware support for end-user PC -RequestManagement -production - - -SW Support -Software support for end-user applications -RequestManagement -production - - diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.servicesubcategory.xml b/modules/itop-service-mgmt-1.0.0/data.sample.servicesubcategory.xml deleted file mode 100644 index c92d5540c..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.servicesubcategory.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - -Configuration -Request application configuration -3 - - -DataRestore -Restore data from backup -2 - - -Equipment down -Network equipment -4 - - -Failure -PC not working -2 - - -Installation -Request PC setup -2 - - -Installation -Request application installation -3 - - -Intrusion -An intrusion has been detected -4 - - -Performance -Slow traffic -4 - - -Renew -Order a replacement PC -2 - - -Training -Request application training -3 - - -Troubleshooting -Request help for troubleshooting -3 - - -Virus -Suspecting a virus infection -2 - - diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.sla.xml b/modules/itop-service-mgmt-1.0.0/data.sample.sla.xml deleted file mode 100644 index 8a72ee6ca..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.sla.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - -NW support - Bronze -4 - - -NW support - Gold -4 - - -NW support - Silver -4 - - -PC support - Bronze -2 - - -PC support - Gold -2 - - -PC support - Silver -2 - - -SW support - Bronze -3 - - -SW support - Gold -3 - - -SW support - Silver -3 - - diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.slt.xml b/modules/itop-service-mgmt-1.0.0/data.sample.slt.xml deleted file mode 100644 index 62b1a69ff..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.slt.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - -Bronze-TTO prio1 -TTO -1 -2 -hours - - -Bronze-TTO prio2 -TTO -2 -4 -hours - - -Bronze-TTO prio3 -TTO -3 -8 -hours - - -Bronze-TTR prio1 -TTR -1 -1 -days - - -Bronze-TTR prio2 -TTR -2 -2 -days - - -Bronze-TTR prio3 -TTR -3 -3 -days - - -Gold-TTO prio1 -TTO -1 -30 -minutes - - -Gold-TTO prio2 -TTO -2 -1 -hours - - -Gold-TTO prio3 -TTO -3 -2 -hours - - -Gold-TTR prio1 -TTR -1 -2 -hours - - -Gold-TTR prio2 -TTR -2 -4 -hours - - -Gold-TTR prio3 -TTR -3 -1 -days - - -Silver-TTO prio1 -TTO -1 -1 -hours - - -Silver-TTO prio2 -TTO -2 -2 -hours - - -Silver-TTO prio3 -TTO -3 -4 -hours - - -Silver-TTR prio1 -TTR -1 -4 -hours - - -Silver-TTR prio2 -TTR -2 -1 -days - - -Silver-TTR prio3 -TTR -3 -2 -days - - \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/data.sample.slttosla.xml b/modules/itop-service-mgmt-1.0.0/data.sample.slttosla.xml deleted file mode 100644 index 97899a6fc..000000000 --- a/modules/itop-service-mgmt-1.0.0/data.sample.slttosla.xml +++ /dev/null @@ -1,219 +0,0 @@ - - - -1 -4 - - -1 -3 - - -1 -2 - - -1 -1 - - -1 -6 - - -1 -5 - - -2 -12 - - -2 -11 - - -2 -10 - - -2 -9 - - -2 -8 - - -2 -7 - - -3 -15 - - -3 -14 - - -3 -13 - - -3 -18 - - -3 -17 - - -3 -16 - - -4 -1 - - -4 -4 - - -4 -2 - - -4 -5 - - -4 -3 - - -4 -6 - - -5 -9 - - -5 -12 - - -5 -7 - - -5 -10 - - -5 -8 - - -5 -11 - - -6 -18 - - -6 -13 - - -6 -16 - - -6 -14 - - -6 -17 - - -6 -15 - - -7 -2 - - -7 -1 - - -7 -6 - - -7 -5 - - -7 -4 - - -7 -3 - - -8 -12 - - -8 -11 - - -8 -10 - - -8 -9 - - -8 -8 - - -8 -7 - - -9 -13 - - -9 -18 - - -9 -17 - - -9 -16 - - -9 -15 - - -9 -14 - - \ No newline at end of file diff --git a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php b/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php index 579abfdee..1328dfd18 100644 --- a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php +++ b/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php @@ -300,7 +300,7 @@ Dict::Add('EN US', 'English', 'English', array( 'Class:SLA/Attribute:service_name' => 'Service', 'Class:SLA/Attribute:service_name+' => '', 'Class:SLA/Attribute:slt_list' => 'SLTs', - 'Class:SLA/Attribute:slt_list+' => 'List of Service Level Targets', + 'Class:SLA/Attribute:slt_list+' => 'List Service Level Thresholds', )); // diff --git a/modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php b/modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php index 8ab4ce4dc..7c8af94d3 100644 --- a/modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php +++ b/modules/itop-service-mgmt-1.0.0/module.itop-service-mgmt.php @@ -30,19 +30,19 @@ SetupWebPage::AddModule( //'data.struct.itop-service-mgmt.xml', ), 'data.sample' => array( - 'data.sample.service.xml', - 'data.sample.servicesubcategory.xml', - 'data.sample.sla.xml', - 'data.sample.slt.xml', - 'data.sample.slttosla.xml', - 'data.sample.customercontract.xml', - 'data.sample.contracttosla.xml', + 'data.sample.Service.xml', + 'data.sample.ServiceSubcategory.xml', + 'data.sample.SLA.xml', + 'data.sample.SLT.xml', + 'data.sample.lnkSLTToSLA.xml', + 'data.sample.Contract.xml', + 'data.sample.lnkContractToSLA.xml', ), // Documentation // 'doc.manual_setup' => '', // No manual installation instructions - 'doc.more_information' => '/doc/xxx/yyy.htm', + 'doc.more_information' => '/doc/itop-documentation.htm#ServiceMgmt', ) ); diff --git a/modules/itop-service-mgmt-1.0.0/overview.html b/modules/itop-service-mgmt-1.0.0/overview.html new file mode 100644 index 000000000..d118f5901 --- /dev/null +++ b/modules/itop-service-mgmt-1.0.0/overview.html @@ -0,0 +1,14 @@ +

UI:ServiceMgmtMenuOverview:Title

+ + + + + +
+

UI-ServiceManagementOverview-CustomerContractToRenew

+SELECT CustomerContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) +		 +

UI-ServiceManagementOverview-ProviderContractToRenew

+SELECT ProviderContract AS c WHERE c.end_date < DATE_ADD(NOW(), INTERVAL 30 DAY) +
+ diff --git a/modules/itop-tickets-1.0.0/model.itop-tickets.php b/modules/itop-tickets-1.0.0/model.itop-tickets.php index 0b79b9296..af5d29cc5 100644 --- a/modules/itop-tickets-1.0.0/model.itop-tickets.php +++ b/modules/itop-tickets-1.0.0/model.itop-tickets.php @@ -177,21 +177,21 @@ abstract class ResponseTicket extends Ticket MetaModel::Init_InheritAttributes(); MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('new,assigned,frozen,escalated_tto,escalated_ttr,resolved,closed'), "sql"=>"status", "default_value"=>"new", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>null, "sql"=>"caller_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("caller_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Person WHERE org_id = :this->org_id'), "sql"=>"caller_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("caller_email", array("allowed_values"=>null, "extkey_attcode"=>"caller_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("org_id", array("targetclass"=>"Organization", "jointype"=>null, "allowed_values"=>null, "sql"=>"org_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_AUTO, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("org_name", array("allowed_values"=>null, "extkey_attcode"=>"org_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"Service", "jointype"=>null, "allowed_values"=>null, "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("service_id", array("targetclass"=>"Service", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Service AS s JOIN SLA AS sla ON sla.service_id=s.id JOIN lnkContractToSLA AS ln ON ln.sla_id=sla.id JOIN CustomerContract AS cc ON ln.contract_id=cc.id WHERE cc.org_id =:this->org_id'), "sql"=>"service_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("service_name", array("allowed_values"=>null, "extkey_attcode"=>"service_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("servicesubcategory_id", array("targetclass"=>"ServiceSubcategory", "jointype"=>null, "allowed_values"=>null, "sql"=>"servicesubcategory_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("servicesubcategory_id", array("targetclass"=>"ServiceSubcategory", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT ServiceSubcategory WHERE service_id = :this->service_id'), "sql"=>"servicesubcategory_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("service_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("servicesubcategory_name", array("allowed_values"=>null, "extkey_attcode"=>"servicesubcategory_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeString("product", array("allowed_values"=>null, "sql"=>"product", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("impact", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"impact", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("urgency", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"urgency", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeEnum("priority", array("allowed_values"=>new ValueSetEnum('1,2,3'), "sql"=>"priority", "default_value"=>"1", "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"Team", "jointype"=>null, "allowed_values"=>null, "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("workgroup_id", array("targetclass"=>"Team", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Team AS t JOIN CustomerContract AS cc ON cc.support_team_id=t.id JOIN lnkContractToSLA AS ln ON ln.contract_id=cc.id JOIN SLA AS sla ON ln.sla_id=sla.id WHERE sla.service_id = :this->service_id AND cc.org_id = :this->org_id'), "sql"=>"workgroup_id", "is_null_allowed"=>false, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("org_id","service_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("workgroup_name", array("allowed_values"=>null, "extkey_attcode"=>"workgroup_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>null, "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeExternalKey("agent_id", array("targetclass"=>"Person", "jointype"=>null, "allowed_values"=>new ValueSetObjects('SELECT Person AS p JOIN lnkTeamToContact AS l ON l.contact_id=p.id JOIN Team AS t ON l.team_id=t.id WHERE t.id = :this->workgroup_id'), "sql"=>"agent_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array("workgroup_id")))); MetaModel::Init_AddAttribute(new AttributeExternalField("agent_name", array("allowed_values"=>null, "extkey_attcode"=>"agent_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalField("agent_email", array("allowed_values"=>null, "extkey_attcode"=>"agent_id", "target_attcode"=>"email", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeExternalKey("related_problem_id", array("targetclass"=>"Problem", "jointype"=>null, "allowed_values"=>null, "sql"=>"related_problem_id", "is_null_allowed"=>true, "on_target_delete"=>DEL_MANUAL, "depends_on"=>array()))); @@ -208,7 +208,7 @@ abstract class ResponseTicket extends Ticket MetaModel::Init_AddAttribute(new AttributeEnum("user_satisfaction", array("allowed_values"=>new ValueSetEnum('1,2,3,4'), "sql"=>"user_satisfaction", "default_value"=>"1", "is_null_allowed"=>true, "depends_on"=>array()))); MetaModel::Init_AddAttribute(new AttributeText("user_commment", array("allowed_values"=>null, "sql"=>"user_commment", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_SetZListItems('details', array('ref', 'title', 'ticket_log', 'start_date', 'escalation_deadline', 'closure_deadline', 'document_list', 'ci_list', 'contact_list', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment')); + MetaModel::Init_SetZListItems('details', array('ref', 'title', 'ticket_log', 'start_date', 'escalation_deadline', 'closure_deadline', 'document_list', 'ci_list', 'contact_list', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment')); MetaModel::Init_SetZListItems('advanced_search', array('finalclass', 'ref', 'title', 'ticket_log', 'start_date', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'escalation_deadline', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment')); MetaModel::Init_SetZListItems('standard_search', array('finalclass', 'ref', 'title', 'ticket_log', 'start_date', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'escalation_deadline', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment')); MetaModel::Init_SetZListItems('list', array('finalclass', 'ref', 'title', 'ticket_log', 'start_date', 'status', 'caller_id', 'org_id', 'service_id', 'servicesubcategory_id', 'product', 'impact', 'urgency', 'priority', 'workgroup_id', 'agent_id', 'agent_email', 'related_problem_id', 'related_change_id', 'close_date', 'last_update', 'assignment_date', 'escalation_deadline', 'closure_deadline', 'resolution_code', 'solution', 'user_satisfaction', 'user_commment')); diff --git a/setup/index.php b/setup/index.php index eb737f4bd..859e82336 100644 --- a/setup/index.php +++ b/setup/index.php @@ -48,18 +48,25 @@ $oP = new SetupWebPage('iTop configuration wizard'); /** * Get a nicely formatted version string */ -function GetITopVersion() +function GetITopVersion($bShort = true) { $sVersionString = ''; - if (ITOP_REVISION == '$WCREV$') + if ($bShort) { - // This is NOT a version built using the buil system, just display the main version $sVersionString = "iTop Version ".ITOP_VERSION; } else { - // This is a build made from SVN, let display the full information - $sVersionString = "iTop Version ".ITOP_VERSION." revision ".ITOP_REVISION.", built on: ".ITOP_BUILD_DATE; + if (ITOP_REVISION == '$WCREV$') + { + // This is NOT a version built using the buil system, just display the main version + $sVersionString = "iTop Version ".ITOP_VERSION; + } + else + { + // This is a build made from SVN, let display the full information + $sVersionString = "iTop Version ".ITOP_VERSION." revision ".ITOP_REVISION.", built on: ".ITOP_BUILD_DATE; + } } return $sVersionString; } @@ -577,9 +584,10 @@ function WelcomeAndCheckPrerequisites(SetupWebPage $oP, $aParamValues, $iCurrent { $sNextOperation = 'step'.($iCurrentStep+1); $oP->add("

iTop configuration wizard

\n"); - $sVersionString = GetITopVersion(); - $oP->set_title('Welcome to '.$sVersionString); - $oP->log($sVersionString); + $sVersionStringShort = GetITopVersion(true); + $sVersionStringLong = GetITopVersion(false); + $oP->set_title('Welcome to '.$sVersionStringShort); + $oP->log($sVersionStringLong); $oP->add("

Checking prerequisites

\n"); if (CheckPHPVersion($oP)) { diff --git a/setup/xmldataloader.class.inc.php b/setup/xmldataloader.class.inc.php index 4643d41a9..c0f4c9a5d 100644 --- a/setup/xmldataloader.class.inc.php +++ b/setup/xmldataloader.class.inc.php @@ -319,9 +319,9 @@ class XMLDataLoader { $sMsg = "unresolved extkey in $sClass::".$oTargetObj->GetKey()."(".$oTargetObj->GetName().")::$sAttCode=$sTargetClass::$iTempKey"; SetupWebPage::log_warning($sMsg); - echo "
aKeys[".$sTargetClass."]:\n";
-							print_r($this->m_aKeys[$sTargetClass]);
-							echo "
\n"; + //echo "
aKeys[".$sTargetClass."]:\n";
+							//print_r($this->m_aKeys[$sTargetClass]);
+							//echo "
\n"; } else {