#722 Document preview disappeared since 2.0 (not in 1.x)

SVN:trunk[2732]
This commit is contained in:
Romain Quetiez
2013-05-14 15:43:22 +00:00
parent 10a7a5aa38
commit d6da043a32
9 changed files with 34 additions and 7 deletions

View File

@@ -1277,14 +1277,14 @@
<type>Overload-cmdbAbstractObject</type>
<code><![CDATA[ public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
{
parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
if (!$bEditMode)
{
$oPage->SetCurrentTab(Dict::S('Class:Document:PreviewTab'));
$oPage->add('<fieldset>');
$oPage->add('<legend>'.Dict::S('Class:Document:PreviewTab').'</legend>');
$oPage->add($this->DisplayDocumentInline($oPage, 'contents'));
$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
$oPage->add('</fieldset>');
}
parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
}]]></code>
</method>
</methods>

View File

@@ -553,7 +553,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Document/Attribute:service_list+' => 'Services liés à ce document',
'Class:Document/Attribute:ticket_list' => 'Tickets',
'Class:Document/Attribute:ticket_list+' => 'Tickets liés à ce document',
'Class:Document:PreviewTab' => 'Entrevue',
'Class:Document:PreviewTab' => 'Aperçu',
'Class:Subnet/Name' => '%1$s / %2$s',
'Class:Software' => 'Logiciel',
'Class:Software+' => '',

View File

@@ -970,7 +970,29 @@
<fields>
<field id="file" xsi:type="AttributeBlob"/>
</fields>
<methods/>
<methods>
<method id="DisplayBareRelations">
<static>false</static>
<access>public</access>
<type>Overload-cmdbAbstractObject</type>
<comment><![CDATA[/**
* Overload the display of the properties to add a tab (the first one)
* with the preview of the document
*/
]]></comment>
<code><![CDATA[public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
{
parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
if (!$bEditMode)
{
$oPage->add('<fieldset>');
$oPage->add('<legend>'.Dict::S('Class:Document:PreviewTab').'</legend>');
$oPage->add($this->DisplayDocumentInline($oPage, 'file'));
$oPage->add('</fieldset>');
}
}]]></code>
</method>
</methods>
<presentation>
<details>
<items>

View File

@@ -1098,5 +1098,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Menu:Software+' => '',
'UI_WelcomeMenu_AllConfigItems' => 'Zusammenfassung',
'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration',
'Class:Document:PreviewTab' => 'Vorschau',
));
?>

View File

@@ -1793,5 +1793,6 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
'Class:Document:PreviewTab' => 'Preview',
));
?>

View File

@@ -1781,6 +1781,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Server:otherinfo' => 'Otra Información',
'Person:info' => 'Información General',
'Person:notifiy' => 'Notificación',
'Class:Document:PreviewTab' => ' Visualización',
));
?>

View File

@@ -1773,5 +1773,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:Subnet/Tab:FreeIPs' => 'IP disponibles',
'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',
'Class:Subnet/Tab:FreeIPs-explain' => 'Voici un échantillon de dix addresses IP disponibles',
'Class:Document:PreviewTab' => 'Aperçu',
));
?>

View File

@@ -1091,5 +1091,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Server:otherinfo' => '他の情報',
'Person:info' => '情報',
'Person:notifiy' => '通知',
'Class:Document:PreviewTab' => 'プレビュー', // 'Preview', # 'Preview'
));
?>

View File

@@ -1097,5 +1097,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Menu:Software+' => '',
'UI_WelcomeMenu_AllConfigItems' => 'Общее~~',
'Menu:ConfigManagement:Typology' => 'Конфигурация топологии~~',
'Class:Document:PreviewTab' => 'Предпросмотр',
));
?>