Logged as '$sUserName' ";
echo "\n";
echo "
\n";
diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index f980adec1..31be4bef4 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -61,7 +61,7 @@ class UILinksWidget
}
// Many values (or even a unknown list) display an autocomplete
- if ( (count($aAllowedValues) == 0) || (count($aAllowedValues) > 20) )
+ if ( (count($aAllowedValues) == 0) || (count($aAllowedValues) > 50) )
{
// too many choices, use an autocomplete
// The input for the auto complete
diff --git a/application/uiwizard.class.inc.php b/application/uiwizard.class.inc.php
index 3c8a61192..53ef12a88 100644
--- a/application/uiwizard.class.inc.php
+++ b/application/uiwizard.class.inc.php
@@ -34,42 +34,45 @@ class UIWizard
$sJSHandlerCode = ''; // Javascript code to be executed each time this step of the wizard is entered
foreach($aStep as $sAttCode)
{
- $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
- $sAttLabel = $oAttDef->GetLabel();
- $iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
-
- $aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
- if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
+ if ($sAttCode != 'finalclass') // Do not displa the attribute that stores the actual class name
{
- $aFields[$sAttCode] = array();
- foreach($aPrerequisites as $sCode)
+ $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
+ $sAttLabel = $oAttDef->GetLabel();
+ $iOptions = isset($aStates[$this->m_sTargetState]['attribute_list'][$sAttCode]) ? $aStates[$this->m_sTargetState]['attribute_list'][$sAttCode] : 0;
+
+ $aPrerequisites = $oAttDef->GetPrerequisiteAttributes();
+ if ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE | OPT_ATT_MUSTPROMPT))
{
- $aFields[$sAttCode][$sCode] = '';
+ $aFields[$sAttCode] = array();
+ foreach($aPrerequisites as $sCode)
+ {
+ $aFields[$sAttCode][$sCode] = '';
+ }
}
+ if (count($aPrerequisites) > 0)
+ {
+ $aOptions[] = 'Prerequisites: '.implode(', ', $aPrerequisites);
+ }
+
+ $sFieldFlag = ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) ? ' *' : '';
+ $oDefaultValuesSet = $oAttDef->GetDefaultValue(); // @@@ TO DO: get the object's current value if the object exists
+ $sHTMLValue = cmdbAbstractObject::GetFormElementForField($this->m_oPage, $this->m_sClass, $sAttCode, $oAttDef, $oDefaultValuesSet, '', "att_$iMaxInputId");
+ $aFieldsMap[$iMaxInputId] = $sAttCode;
+ $aDetails[] = array('label' => $oAttDef->GetLabel().$sFieldFlag, 'value' => "$sHTMLValue
");
+ if ($oAttDef->GetValuesDef() != null)
+ {
+ $sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
+ }
+ if ($oAttDef->GetDefaultValue() != null)
+ {
+ $sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
+ }
+ if ($oAttDef->IsLinkSet())
+ {
+ $sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
+ }
+ $iMaxInputId++;
}
- if (count($aPrerequisites) > 0)
- {
- $aOptions[] = 'Prerequisites: '.implode(', ', $aPrerequisites);
- }
-
- $sFieldFlag = ($iOptions & (OPT_ATT_MANDATORY | OPT_ATT_MUSTCHANGE)) ? ' *' : '';
- $oDefaultValuesSet = $oAttDef->GetDefaultValue(); // @@@ TO DO: get the object's current value if the object exists
- $sHTMLValue = cmdbAbstractObject::GetFormElementForField($this->m_oPage, $this->m_sClass, $sAttCode, $oAttDef, $oDefaultValuesSet, '', "att_$iMaxInputId");
- $aFieldsMap[$iMaxInputId] = $sAttCode;
- $aDetails[] = array('label' => $oAttDef->GetLabel().$sFieldFlag, 'value' => "$sHTMLValue
");
- if ($oAttDef->GetValuesDef() != null)
- {
- $sJSHandlerCode .= "\toWizardHelper.RequestAllowedValues('$sAttCode');\n";
- }
- if ($oAttDef->GetDefaultValue() != null)
- {
- $sJSHandlerCode .= "\toWizardHelper.RequestDefaultValue('$sAttCode');\n";
- }
- if ($oAttDef->IsLinkSet())
- {
- $sJSHandlerCode .= "\toLinkWidgetatt_$iMaxInputId.Init();";
- }
- $iMaxInputId++;
}
//$aDetails[] = array('label' => '', 'value' => '');
$this->m_oPage->details($aDetails);
diff --git a/business/templates/Circuits.html b/business/templates/Circuits.html
index c3de83c89..f04fe3a87 100644
--- a/business/templates/Circuits.html
+++ b/business/templates/Circuits.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/application.html b/business/templates/application.html
index 4e3c7575e..f934b7b48 100644
--- a/business/templates/application.html
+++ b/business/templates/application.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/change.html b/business/templates/change.html
index 694b26fd6..f2bcd67d7 100644
--- a/business/templates/change.html
+++ b/business/templates/change.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/contract.html b/business/templates/contract.html
index 574c6e37e..110fcdb0e 100644
--- a/business/templates/contract.html
+++ b/business/templates/contract.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/default.html b/business/templates/default.html
index 238a714d8..564b009b5 100644
--- a/business/templates/default.html
+++ b/business/templates/default.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/document.html b/business/templates/document.html
index 470559e8f..cd40cfe78 100644
--- a/business/templates/document.html
+++ b/business/templates/document.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/group.html b/business/templates/group.html
index 11bc83845..fca5fb154 100644
--- a/business/templates/group.html
+++ b/business/templates/group.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/interface.html b/business/templates/interface.html
index 3f1fe7f95..ffa8c7495 100644
--- a/business/templates/interface.html
+++ b/business/templates/interface.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/knownError.html b/business/templates/knownError.html
index 3c321384d..75bcc9eaf 100644
--- a/business/templates/knownError.html
+++ b/business/templates/knownError.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/network.device.html b/business/templates/network.device.html
index cb3a32385..01085e2ec 100644
--- a/business/templates/network.device.html
+++ b/business/templates/network.device.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/pc.html b/business/templates/pc.html
index 55597a4ac..9323a913d 100644
--- a/business/templates/pc.html
+++ b/business/templates/pc.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/person.html b/business/templates/person.html
index 9bc09ad33..567f7b543 100644
--- a/business/templates/person.html
+++ b/business/templates/person.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/server.html b/business/templates/server.html
index f6f5793ed..98185836b 100644
--- a/business/templates/server.html
+++ b/business/templates/server.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/service.html b/business/templates/service.html
index 747ab187a..7e6443eba 100644
--- a/business/templates/service.html
+++ b/business/templates/service.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/software.html b/business/templates/software.html
index ee51b9651..3f690daad 100644
--- a/business/templates/software.html
+++ b/business/templates/software.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/team.html b/business/templates/team.html
index 05e0ec2d2..7e1e5cd6e 100644
--- a/business/templates/team.html
+++ b/business/templates/team.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/business/templates/ticket.html b/business/templates/ticket.html
index 1c034cc7b..425c92840 100644
--- a/business/templates/ticket.html
+++ b/business/templates/ticket.html
@@ -1,6 +1,6 @@
$class$: $name$
+$class_name$: $name$
diff --git a/core/userrights.class.inc.php b/core/userrights.class.inc.php
index b62c8a042..01428ae73 100644
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -176,7 +176,7 @@ class UserRights
public static function GetFilter($sClass)
{
- if (!MetaModel::HasCategory($sClass, 'bizModel')) return new DBObjectSearch($sClass);
+ if (!MetaModel::HasCategory($sClass, 'bizmodel')) return new DBObjectSearch($sClass);
if (!self::CheckLogin()) return false;
return self::$m_oAddOn->GetFilter(self::$m_iUserId, $sClass);
@@ -184,7 +184,7 @@ class UserRights
public static function IsActionAllowed($sClass, $iActionCode, dbObjectSet $aInstances)
{
- if (!MetaModel::HasCategory($sClass, 'bizModel')) return true;
+ if (!MetaModel::HasCategory($sClass, 'bizmodel')) return true;
if (!self::CheckLogin()) return false;
return self::$m_oAddOn->IsActionAllowed(self::$m_iUserId, $sClass, $iActionCode, $aInstances);
@@ -192,7 +192,7 @@ class UserRights
public static function IsStimulusAllowed($sClass, $sStimulusCode, dbObjectSet $aInstances)
{
- if (!MetaModel::HasCategory($sClass, 'bizModel')) return true;
+ if (!MetaModel::HasCategory($sClass, 'bizmodel')) return true;
if (!self::CheckLogin()) return false;
return self::$m_oAddOn->IsStimulusAllowed(self::$m_iUserId, $sClass, $sStimulusCode, $aInstances);
@@ -200,7 +200,7 @@ class UserRights
public static function IsActionAllowedOnAttribute($sClass, $sAttCode, $iActionCode, dbObjectSet $aInstances)
{
- if (!MetaModel::HasCategory($sClass, 'bizModel')) return true;
+ if (!MetaModel::HasCategory($sClass, 'bizmodel')) return true;
if (!self::CheckLogin()) return false;
return self::$m_oAddOn->IsActionAllowedOnAttribute(self::$m_iUserId, $sClass, $sAttCode, $iActionCode, $aInstances);
diff --git a/pages/UI.php b/pages/UI.php
index 3b77f4ce7..48bd6081b 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -243,22 +243,17 @@ switch($operation)
$oP->add_linked_script("../js/jquery.blockUI.js");
$oWizard = new UIWizard($oP, $sClass, $sStateCode);
$sStateCode = $oWizard->GetTargetState(); // Will computes the default state if none was supplied
+ $sClassLabel = MetaModel::GetName($sClass);
+ $oP->p("Creation of a new $sClassLabel
"); if (!empty($sStateCode)) { $aStates = MetaModel::EnumStates($sClass); $sStateLabel = $aStates[$sStateCode]['label']; - $oP->p("Wizard for creating an object of class '$sClass' in state '$sStateCode'."); - } - else - { - // Stateless object - $oP->p("Wizard for creating an object of class '$sClass'."); } $aWizardSteps = $oWizard->GetWizardStructure(); // Display the structure of the wizard $iStepIndex = 1; - $oP->p("Wizard Steps for creating an object of class '$sClass' in state '$sStateCode'
\n"); $iMaxInputId = 0; $aFieldsMap = array(); foreach($aWizardSteps['mandatory'] as $aSteps) diff --git a/pages/opensearch.xml b/pages/opensearch.xml deleted file mode 100644 index 2620b2d1f..000000000 --- a/pages/opensearch.xml +++ /dev/null @@ -1,8 +0,0 @@ -Transitions
\n"); $oPage->add("- \n");
foreach ($aStates as $sStateCode => $aStateDef)
diff --git a/setup/data/03.persons.xml b/setup/data/03.persons.xml
index fa6317ff5..9a102ad6e 100644
--- a/setup/data/03.persons.xml
+++ b/setup/data/03.persons.xml
@@ -1,33 +1,33 @@