commit 53f1c056ebf19d6799b81a58df9d36c6da001f33
parent 4cd714449523f107ee52d5f0599286cd384c3ed7
Author: Jan Dankert <develop@jandankert.de>
Date: Thu, 12 Dec 2019 00:07:30 +0100
New: Output validity of node objects in info view.
Diffstat:
4 files changed, 69 insertions(+), 0 deletions(-)
diff --git a/modules/cms-core/action/ObjectAction.class.php b/modules/cms-core/action/ObjectAction.class.php
@@ -632,6 +632,7 @@ class ObjectAction extends BaseAction
{
$this->setTemplateVars( $this->baseObject->getProperties() );
+ $this->setTemplateVar( 'is_valid' ,$this->baseObject->isValid() );
$this->setTemplateVar( 'full_filename',$this->baseObject->full_filename() );
$this->setTemplateVar( 'extension' , '' );
$this->setTemplateVar( 'mimetype' , $this->baseObject->mimeType() );
diff --git a/modules/cms-core/model/BaseObject.class.php b/modules/cms-core/model/BaseObject.class.php
@@ -428,6 +428,8 @@ SQL
'modelid' =>$this->modelid,
'projectid' =>$this->projectid,
'settings' =>$this->settings,
+ 'valid_from_date' =>$this->validFromDate,
+ 'valid_to_date' =>$this->validToDate,
'type' =>$this->getType() );
}
diff --git a/modules/cms-ui/themes/default/html/views/object/info.php b/modules/cms-ui/themes/default/html/views/object/info.php
@@ -122,6 +122,41 @@
</div>
</div>
</div></fieldset>
+ <fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('validity') ?></legend><div class="closable">
+ <div class="clickable">
+ <a target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="./#//">
+ <div class="line">
+ <div class="label">
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_state'.'')))); ?></span>
+ </div>
+ <div class="input">
+ <?php $if8=($is_valid); if($if8){?>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'is_yes'.'')))); ?></span>
+ <?php } ?>
+ <?php if(!$if8){?>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'is_no'.'')))); ?></span>
+ <?php } ?>
+ </div>
+ </div>
+ <div class="line">
+ <div class="label">
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('from')))); ?></span>
+ </div>
+ <div class="input">
+ <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($valid_from_date) ?>
+ </div>
+ </div>
+ <div class="line">
+ <div class="label">
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('until')))); ?></span>
+ </div>
+ <div class="input">
+ <?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($valid_to_date) ?>
+ </div>
+ </div>
+ </a>
+ </div>
+ </div></fieldset>
<fieldset class="toggle-open-close<?php echo true?" open":" closed" ?><?php echo true?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('prop_userinfo') ?></legend><div class="closable">
<div class="line">
<div class="label">
diff --git a/modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/info.tpl.src.xml
@@ -124,6 +124,37 @@
</part>
</part>
</group>
+ <group title="message:validity">
+ <part class="clickable">
+ <link subaction="settings" type="dialog">
+ <part class="line">
+ <part class="label">
+ <text key="global_state"></text>
+ </part>
+ <part class="input">
+ <if true="var:is_valid"><text key="is_yes" /></if>
+ <else><text key="is_no" /></else>
+ </part>
+ </part>
+ <part class="line">
+ <part class="label">
+ <text text="from"></text>
+ </part>
+ <part class="input">
+ <date date="var:valid_from_date" />
+ </part>
+ </part>
+ <part class="line">
+ <part class="label">
+ <text text="until"></text>
+ </part>
+ <part class="input">
+ <date date="var:valid_to_date" />
+ </part>
+ </part>
+ </link>
+ </part>
+ </group>
<group title="message:prop_userinfo">
<part class="line">
<part class="label">
