Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination

This commit is contained in:
aina-esokia
2018-10-23 18:11:34 +04:00
3 changed files with 4 additions and 2 deletions

View File

@@ -1101,6 +1101,7 @@ class record_adapter implements RecordInterface, cache_cacheableInterface
$this->set_xml($xml); $this->set_xml($xml);
unset($xml); unset($xml);
$this->write_metas();
$this->dispatch(RecordEvents::METADATA_CHANGED, new MetadataChangedEvent($this)); $this->dispatch(RecordEvents::METADATA_CHANGED, new MetadataChangedEvent($this));
return $this; return $this;

View File

@@ -101,6 +101,7 @@ dd {
white-space: nowrap; white-space: nowrap;
} }
dd { dd {
margin-left: 180px; display: inline-block;
float: left;
} }
} }

View File

@@ -13,7 +13,7 @@
<div style="padding: 4px;"> <div style="padding: 4px;">
<div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;"> <div style="height:40px; position: relative; z-index: 95;margin-bottom:0;border-bottom:none;">
<div class="title" style="max-height:100%" title="{{ record.getTitle(app.locale) }}"> <div class="title" style="max-height:100%" title="{{ record.getTitle(app.locale) }}">
{{ record.getTitle(app.locale)|highlight }} {{ record.getTitle(app.locale)|e|highlight }}
</div> </div>
<div class="status"> <div class="status">
{% for flag in record_flags(record) %} {% for flag in record_flags(record) %}