update

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@781 a333f486-631f-4898-b8df-5754b55c2be0

modules/itop-change-mgmt-1.0.0/model.itop-change-mgmt.php

@@ -538,7 +538,7 @@ new TemplateMenuNode('Change:Overview', '../modules/itop-change-mgmt-1.0.0/overv
 new NewObjectMenuNode('NewChange', 'Change', $oMyMenuGroup->GetIndex(), 1 /* fRank */);
 new SearchMenuNode('SearchChanges', 'Change', $oMyMenuGroup->GetIndex(), 2 /* fRank */);
 $oShortcutNode = new TemplateMenuNode('Change:Shortcuts', '', $oMyMenuGroup->GetIndex(), 3 /* fRank */);
-$oNode = new OQLMenuNode('MyChanges', 'SELECT Change WHERE agent_id = :current_contact_id', $oShortcutNode->GetIndex(), 1 /* fRank */);
+$oNode = new OQLMenuNode('MyChanges', 'SELECT Change WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")', $oShortcutNode->GetIndex(), 1 /* fRank */);
 $oNode->SetParameters(array('auto_reload' => 'fast'));
 $oNode = new OQLMenuNode('Changes', 'SELECT Change WHERE status != "closed"', $oShortcutNode->GetIndex(), 2 /* fRank */);
 $oNode->SetParameters(array('auto_reload' => 'fast'));

modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php

@@ -268,14 +268,14 @@ Dict::Add('EN US', 'English', 'English', array(
 ));
 
 //
-// Class: ExternalDoc
+// Class: WebDoc
 //
 
 Dict::Add('EN US', 'English', 'English', array(
-	'Class:ExternalDoc' => 'External Document',
-	'Class:ExternalDoc+' => 'Document available on another web server',
-	'Class:ExternalDoc/Attribute:url' => 'Url',
-	'Class:ExternalDoc/Attribute:url+' => '',
+	'Class:WebDoc' => 'Web Document',
+	'Class:WebDoc+' => 'Document available on another web server',
+	'Class:WebDoc/Attribute:url' => 'Url',
+	'Class:WebDoc/Attribute:url+' => '',
 ));
 
 //

modules/itop-config-mgmt-1.0.0/es_cr.dict.itop-config-mgmt.php

@@ -268,14 +268,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 ));
 
 //
-// Class: ExternalDoc
+// Class: WebDoc
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:ExternalDoc' => 'Documento externo',
-	'Class:ExternalDoc+' => 'Documento disponible en otro servidor Web',
-	'Class:ExternalDoc/Attribute:url' => 'Url',
-	'Class:ExternalDoc/Attribute:url+' => '',
+	'Class:WebDoc' => 'Documento Web',
+	'Class:WebDoc+' => 'Documento disponible en otro servidor Web',
+	'Class:WebDoc/Attribute:url' => 'Url',
+	'Class:WebDoc/Attribute:url+' => '',
 ));
 
 //

modules/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php

@@ -266,14 +266,14 @@ Dict::Add('FR FR', 'French', 'Français', array(
 ));
 
 //
-// Class: ExternalDoc
+// Class: WebDoc
 //
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Class:ExternalDoc' => 'Document externe',
-	'Class:ExternalDoc+' => 'Document mis à disposition depuis un serveur web externe',
-	'Class:ExternalDoc/Attribute:url' => 'Url',
-	'Class:ExternalDoc/Attribute:url+' => '',
+	'Class:WebDoc' => 'Document Web',
+	'Class:WebDoc+' => 'Document mis à disposition depuis un serveur web externe',
+	'Class:WebDoc/Attribute:url' => 'Url',
+	'Class:WebDoc/Attribute:url+' => '',
 ));
 
 //

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -152,7 +152,7 @@ class Person extends Contact
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array("name"),
+			"reconc_keys" => array("name","first_name","org_id","email"),
 			"db_table" => "person",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -186,7 +186,7 @@ class Team extends Contact
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array("name", "org_id", "org_name"),
+			"reconc_keys" => array("name", "org_id"),
 			"db_table" => "team",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
@@ -276,7 +276,7 @@ abstract class Document extends cmdbAbstractObject
 		MetaModel::Init_SetZListItems('list', array('name', 'org_id', 'type', 'status'));
 	}
 }
-class ExternalDoc extends Document
+class WebDoc extends Document
 {
 
 	public static function Init()
@@ -1016,7 +1016,7 @@ class NetworkInterface extends ConnectableCI
 			"key_type" => "autoincrement",
 			"name_attcode" => "name",
 			"state_attcode" => "",
-			"reconc_keys" => array("name","device_id","org_id", "device_name", "owner_name"),
+			"reconc_keys" => array("name","device_id","org_id"),
 			"db_table" => "networkinterface",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",

modules/itop-incident-mgmt-1.0.0/model.itop-incident-mgmt.php

@@ -221,11 +221,11 @@ new TemplateMenuNode('Incident:Overview', '../modules/itop-incident-mgmt-1.0.0/o
 new NewObjectMenuNode('NewIncident', 'Incident', $oMyMenuGroup->GetIndex(), 1 /* fRank */);
 new SearchMenuNode('SearchIncidents', 'Incident', $oMyMenuGroup->GetIndex(), 2 /* fRank */);
 $oShortcutNode = new TemplateMenuNode('Incident:Shortcuts', '', $oMyMenuGroup->GetIndex(), 3 /* fRank */);
-$oNode = new OQLMenuNode('Incident:MyIncidents', 'SELECT Incident WHERE agent_id = :current_contact_id', $oShortcutNode->GetIndex(), 1 /* fRank */);
+$oNode = new OQLMenuNode('Incident:MyIncidents', 'SELECT Incident WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")', $oShortcutNode->GetIndex(), 1 /* fRank */);
 $oNode->SetParameters(array('auto_reload' => 'fast'));
 $oNode = new OQLMenuNode('Incident:EscalatedIncidents', 'SELECT Incident WHERE status IN ("escalated_tto", "escalated_ttr")', $oShortcutNode->GetIndex(), 2 /* fRank */);
 $oNode->SetParameters(array('auto_reload' => 'fast'));
 $oNode = new OQLMenuNode('Incident:OpenIncidents', 'SELECT Incident WHERE status IN ("new", "assigned", "escalated_tto", "escalated_ttr", "resolved")', $oShortcutNode->GetIndex(), 3 /* fRank */);
-$oNode->SetParameters(array('auto_reload' => 'fast'));
+$oNode->SetParameters(array('auto_reload' => 'standard'));
 
 ?>

modules/itop-incident-mgmt-1.0.0/overview.html

@@ -11,7 +11,7 @@
 <tr>
 <td class="dashboard">
 <h2><itopstring>UI-IncidentManagementOverview-IncidentUnassigned</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT Incident WHERE status = 'new'</itopblock>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT Incident WHERE status IN ("new", "escalated_tto")</itopblock>
 </td>
 <td class="dashboard">
 </td>

modules/itop-knownerror-mgmt-1.0.0/module.itop-knownerror-mgmt.php

@@ -27,6 +27,8 @@ SetupWebPage::AddModule(
 		),
 		'dictionary' => array(
 			'en.dict.itop-knownerror-mgmt.php',
+			'es_cr.dict.itop-knownerror-mgmt.php',
+			'fr.dict.itop-knownerror-mgmt.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-knownerror-mgmt.xml',

modules/itop-problem-mgmt-1.0.0/en.dict.itop-problem-mgmt.php

@@ -67,6 +67,15 @@ Dict::Add('EN US', 'English', 'English', array(
         'Menu:Problem:MyProblems+' => 'My Problems',
         'Menu:Problem:OpenProblems' => 'All Open problems',
         'Menu:Problem:OpenProblems+' => 'All Open problems',
+	'UI-ProblemManagementOverview-ProblemByService' => 'Problems by Service',
+	'UI-ProblemManagementOverview-ProblemByService+' => 'Problems by Service',
+	'UI-ProblemManagementOverview-ProblemByPriority' => 'Problems by Priority',
+	'UI-ProblemManagementOverview-ProblemByPriority+' => 'Problems by Priority',
+	'UI-ProblemManagementOverview-ProblemUnassigned' => 'Unassigned Problems',
+	'UI-ProblemManagementOverview-ProblemUnassigned+' => 'Unassigned Problems',
+	'UI:ProblemMgmtMenuOverview:Title' => 'Dashboard for Problem Management',
+	'UI:ProblemMgmtMenuOverview:Title+' => 'Dashboard for Problem Management',
+
 ));
 //
 // Class: Problem

modules/itop-problem-mgmt-1.0.0/model.itop-problem-mgmt.php

@@ -231,7 +231,7 @@ new TemplateMenuNode('Problem:Overview', '../modules/itop-problem-mgmt-1.0.0/ove
 new NewObjectMenuNode('NewProblem', 'Problem', $iIndex, 1 /* fRank */);
 new SearchMenuNode('SearchProblems', 'Problem', $iIndex, 2 /* fRank */);
 $oShortcutNode = new TemplateMenuNode('Problem:Shortcuts', '', $iIndex, 4 /* fRank */);
-new OQLMenuNode('Problem:MyProblems', 'SELECT Problem WHERE agent_id = :current_contact_id', $oShortcutNode->GetIndex(), 1 /* fRank */);
+new OQLMenuNode('Problem:MyProblems', 'SELECT Problem WHERE agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")', $oShortcutNode->GetIndex(), 1 /* fRank */);
 new OQLMenuNode('Problem:OpenProblems', 'SELECT Problem WHERE status IN ("new", "assigned", "resolved")', $oShortcutNode->GetIndex(), 3 /* fRank */);
 
 ?>

modules/itop-problem-mgmt-1.0.0/module.itop-problem-mgmt.php

@@ -28,6 +28,7 @@ SetupWebPage::AddModule(
 		'dictionary' => array(
 			'en.dict.itop-problem-mgmt.php',
 			'es_cr.dict.itop-problem-mgmt.php',
+			'fr.dict.itop-problem-mgmt.php',
 		),
 		'data.struct' => array(
 			//'data.struct.itop-problem-mgmt.xml',

modules/itop-request-mgmt-1.0.0/overview.html

@@ -11,7 +11,7 @@
 <tr>
 <td class="dashboard">
 <h2><itopstring>UI-RequestManagementOverview-RequestUnassigned</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT UserRequest WHERE status = 'new'</itopblock>
+<itopblock BlockClass="DisplayBlock" type="list" parameters="dashboard:true" asynchronous="false" encoding="text/oql">SELECT UserRequest WHERE status IN ("new", "escalated_tto")</itopblock>
 </td>
 <td>
 &nbsp;

modules/itop-service-mgmt-1.0.0/model.itop-service-mgmt.php

@@ -315,7 +315,7 @@ class Service extends cmdbAbstractObject
 		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("provider_name", array("allowed_values"=>null, "extkey_attcode"=>"org_id", "target_attcode"=>"name", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
+		MetaModel::Init_AddAttribute(new AttributeText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("type", array("allowed_values"=>new ValueSetEnum('RequestManagement,IncidentManagement'), "sql"=>"type", "default_value"=>"IncidentManagement", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('design,production,obsolete'), "sql"=>"status", "default_value"=>"design", "is_null_allowed"=>true, "depends_on"=>array())));
 		MetaModel::Init_AddAttribute(new AttributeLinkedSet("subcategory_list", array("linked_class"=>"ServiceSubcategory", "ext_key_to_me"=>"service_id", "allowed_values"=>null, "count_min"=>0, "count_max"=>0, "depends_on"=>array())));