Compare commits

..

2 commits

Author SHA1 Message Date
j
d7fa7efcbc add layer option to populate default value for new annotations 2018-10-09 16:32:35 +02:00
j
1d40ceca8f remove unused external keys 2018-10-07 14:41:25 +02:00
5 changed files with 25 additions and 2 deletions

View file

@ -864,6 +864,8 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
"canPlayClips": If true, clips from this layer will play for users
with canPlayClips access
"entity": ID of the referenced entity (if type is "entity")
"getDefaults": function in pandora namespace that gets called
to populate defaults for new annotations. i.e. getCurrentFrameAnnotation
"hasEvents": If true, the calendar will be populated with matches from
this layer
"hasPlaces": If true, the map will be populated with matches from this

View file

@ -307,6 +307,11 @@ class Item(models.Model):
response = external_data('getData', {'id': self.public_id})
if response['status']['code'] == 200:
self.external_data = response['data']
keys = [
k['id'] for k in settings.CONFIG['itemKeys']
] + settings.ADDITIONAL_IMDB_KEYS
for key in set(self.external_data) - set(keys):
del self.external_data[key]
self.save(sync=True)
if poster_url != self.prefered_poster_url():
self.remove_poster()

View file

@ -217,6 +217,11 @@ POSTER_PRECEDENCE = ()
POSTER_ONLY_PORTRAIT = ()
USE_IMDB = False
ADDITIONAL_IMDB_KEYS = [
'cast',
'links', 'reviews', 'posters',
'alternativeTitles', 'originalTitle',
]
#If you set VIDEO_PREFIX make sure cookies work accros subsomains
#by setting SESSION_COOKIE_DOMAIN to ".domain.tld"

View file

@ -114,7 +114,8 @@ pandora.ui.editor = function(data) {
// async to not capture keyboard input
setTimeout(function() {
var created = Ox.formatDate(new Date(), '%Y-%m-%dT%H:%M:%SZ'),
type = Ox.getObjectById(pandora.site.layers, data.layer).type;
layer = Ox.getObjectById(pandora.site.layers, data.layer),
type = layer.type;
that.addAnnotation(data.layer, Ox.extend(
{
created: created,
@ -131,7 +132,8 @@ pandora.ui.editor = function(data) {
place: {lat: null, lng: null}
} : type == 'event' ? {
event: {start: '', end: ''}
} : {}
} : {},
layer.getDefaults ? pandora[layer.getDefaults](data) : {}
));
Ox.Request.clearCache();
});

View file

@ -1274,6 +1274,15 @@ pandora.getClipVideos = function(clip, resolution) {
}));
};
pandora.getCurrentFrameAnnotation = function(data) {
var ui = pandora.user.ui,
position = ui.videoPoints[ui.item].position,
resolution = Ox.max(pandora.site.video.resolutions);
return {
value: '<img src="/' + ui.item + '/' + resolution + 'p' + position + '.jpg">\n\n'
};
};
(function() {
var itemTitles = {}, documentTitles = {};
pandora.getWindowTitle = function(itemData) {