forked from 0x2620/pandora
ui.onload -> user.script, fixes #2697
This commit is contained in:
parent
fa376dd188
commit
90a49b2a4d
9 changed files with 112 additions and 9 deletions
|
@ -903,7 +903,6 @@
|
||||||
"locale": "en",
|
"locale": "en",
|
||||||
"mapFind": "",
|
"mapFind": "",
|
||||||
"mapSelection": "",
|
"mapSelection": "",
|
||||||
"onload": "",
|
|
||||||
"page": "",
|
"page": "",
|
||||||
"part": {
|
"part": {
|
||||||
"api": "",
|
"api": "",
|
||||||
|
@ -974,6 +973,7 @@
|
||||||
"videoView": "player",
|
"videoView": "player",
|
||||||
"videoVolume": 1
|
"videoVolume": 1
|
||||||
},
|
},
|
||||||
|
"script": "",
|
||||||
"username": "",
|
"username": "",
|
||||||
"volumes": []
|
"volumes": []
|
||||||
},
|
},
|
||||||
|
|
|
@ -918,7 +918,6 @@
|
||||||
"locale": "en",
|
"locale": "en",
|
||||||
"mapFind": "",
|
"mapFind": "",
|
||||||
"mapSelection": "",
|
"mapSelection": "",
|
||||||
"onload": "",
|
|
||||||
"page": "",
|
"page": "",
|
||||||
"part": {
|
"part": {
|
||||||
"api": "",
|
"api": "",
|
||||||
|
@ -989,6 +988,7 @@
|
||||||
"videoView": "player",
|
"videoView": "player",
|
||||||
"videoVolume": 1
|
"videoVolume": 1
|
||||||
},
|
},
|
||||||
|
"script": "",
|
||||||
"username": "",
|
"username": "",
|
||||||
"volumes": []
|
"volumes": []
|
||||||
},
|
},
|
||||||
|
|
|
@ -800,7 +800,6 @@
|
||||||
"locale": "en",
|
"locale": "en",
|
||||||
"mapFind": "",
|
"mapFind": "",
|
||||||
"mapSelection": "",
|
"mapSelection": "",
|
||||||
"onload": "",
|
|
||||||
"page": "",
|
"page": "",
|
||||||
"part": {
|
"part": {
|
||||||
"api": "",
|
"api": "",
|
||||||
|
@ -874,6 +873,7 @@
|
||||||
"videoView": "player",
|
"videoView": "player",
|
||||||
"videoVolume": 1
|
"videoVolume": 1
|
||||||
},
|
},
|
||||||
|
"script": "",
|
||||||
"username": "",
|
"username": "",
|
||||||
"volumes": []
|
"volumes": []
|
||||||
},
|
},
|
||||||
|
|
|
@ -843,7 +843,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
|
||||||
"locale": "en",
|
"locale": "en",
|
||||||
"mapFind": "",
|
"mapFind": "",
|
||||||
"mapSelection": "",
|
"mapSelection": "",
|
||||||
"onload": "",
|
|
||||||
"page": "",
|
"page": "",
|
||||||
"part": {
|
"part": {
|
||||||
"api": "",
|
"api": "",
|
||||||
|
@ -916,6 +915,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
|
||||||
"videoView": "player",
|
"videoView": "player",
|
||||||
"videoVolume": 1
|
"videoVolume": 1
|
||||||
},
|
},
|
||||||
|
"script": "",
|
||||||
"username": "",
|
"username": "",
|
||||||
"volumes": []
|
"volumes": []
|
||||||
},
|
},
|
||||||
|
|
97
pandora/user/migrations/0004_onload.py
Normal file
97
pandora/user/migrations/0004_onload.py
Normal file
|
@ -0,0 +1,97 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
import datetime
|
||||||
|
from south.db import db
|
||||||
|
from south.v2 import DataMigration
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
class Migration(DataMigration):
|
||||||
|
|
||||||
|
def forwards(self, orm):
|
||||||
|
for p in orm['user.userprofile'].objects.all():
|
||||||
|
if 'onload' in p.ui:
|
||||||
|
p.preferences['script'] = p.ui['onload']
|
||||||
|
del p.ui['onload']
|
||||||
|
p.save()
|
||||||
|
|
||||||
|
def backwards(self, orm):
|
||||||
|
"Write your backwards methods here."
|
||||||
|
for p in orm['user.userprofile'].objects.all():
|
||||||
|
if 'script' in p.preferences:
|
||||||
|
p.ui['onload'] = p.preferences['script']
|
||||||
|
del p.preferences['script']
|
||||||
|
p.save()
|
||||||
|
|
||||||
|
models = {
|
||||||
|
'auth.group': {
|
||||||
|
'Meta': {'object_name': 'Group'},
|
||||||
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}),
|
||||||
|
'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
|
||||||
|
},
|
||||||
|
'auth.permission': {
|
||||||
|
'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
|
||||||
|
'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||||
|
'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
|
||||||
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
|
||||||
|
},
|
||||||
|
'auth.user': {
|
||||||
|
'Meta': {'object_name': 'User'},
|
||||||
|
'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||||
|
'email': ('django.db.models.fields.EmailField', [], {'max_length': '255', 'blank': 'True'}),
|
||||||
|
'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||||
|
'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||||
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||||
|
'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||||
|
'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
|
||||||
|
'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||||
|
'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
|
||||||
|
'password': ('django.db.models.fields.CharField', [], {'max_length': '255'}),
|
||||||
|
'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
|
||||||
|
'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'})
|
||||||
|
},
|
||||||
|
'contenttypes.contenttype': {
|
||||||
|
'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
|
||||||
|
'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||||
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
|
||||||
|
'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
|
||||||
|
},
|
||||||
|
'user.sessiondata': {
|
||||||
|
'Meta': {'object_name': 'SessionData'},
|
||||||
|
'browser': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||||
|
'firstseen': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
|
||||||
|
'groupssort': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}),
|
||||||
|
'info': ('ox.django.fields.DictField', [], {'default': '{}'}),
|
||||||
|
'ip': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||||
|
'lastseen': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'db_index': 'True'}),
|
||||||
|
'level': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
|
||||||
|
'location': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||||
|
'location_sort': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||||
|
'numberoflists': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True'}),
|
||||||
|
'screensize': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||||
|
'session_key': ('django.db.models.fields.CharField', [], {'max_length': '40', 'primary_key': 'True'}),
|
||||||
|
'system': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'}),
|
||||||
|
'timesseen': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
|
||||||
|
'user': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'data'", 'unique': 'True', 'null': 'True', 'to': "orm['auth.User']"}),
|
||||||
|
'useragent': ('django.db.models.fields.CharField', [], {'max_length': '4096', 'null': 'True'}),
|
||||||
|
'username': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'db_index': 'True'}),
|
||||||
|
'windowsize': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True'})
|
||||||
|
},
|
||||||
|
'user.userprofile': {
|
||||||
|
'Meta': {'object_name': 'UserProfile'},
|
||||||
|
'files_updated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
|
||||||
|
'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
|
||||||
|
'level': ('django.db.models.fields.IntegerField', [], {'default': '1'}),
|
||||||
|
'newsletter': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
|
||||||
|
'notes': ('django.db.models.fields.TextField', [], {'default': "''"}),
|
||||||
|
'preferences': ('ox.django.fields.DictField', [], {'default': '{}'}),
|
||||||
|
'reset_code': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
|
||||||
|
'ui': ('ox.django.fields.DictField', [], {'default': '{}'}),
|
||||||
|
'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'profile'", 'unique': 'True', 'to': "orm['auth.User']"})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
complete_apps = ['user']
|
||||||
|
symmetrical = True
|
|
@ -350,6 +350,7 @@ def init_user(user, request=None):
|
||||||
result['newsletter'] = profile.newsletter
|
result['newsletter'] = profile.newsletter
|
||||||
result['ui'] = profile.get_ui()
|
result['ui'] = profile.get_ui()
|
||||||
result['volumes'] = [v.json() for v in user.volumes.all()]
|
result['volumes'] = [v.json() for v in user.volumes.all()]
|
||||||
|
result['script'] = profile.preferences.get('script', '')
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def user_json(user, keys=None):
|
def user_json(user, keys=None):
|
||||||
|
@ -364,6 +365,7 @@ def user_json(user, keys=None):
|
||||||
'newsletter': p.newsletter,
|
'newsletter': p.newsletter,
|
||||||
'notes': p.notes,
|
'notes': p.notes,
|
||||||
'numberoflists': user.lists.count(),
|
'numberoflists': user.lists.count(),
|
||||||
|
'script': p.preferences.get('script', ''),
|
||||||
'username': user.username,
|
'username': user.username,
|
||||||
}
|
}
|
||||||
if keys:
|
if keys:
|
||||||
|
|
|
@ -708,6 +708,10 @@ def editPreferences(request, data):
|
||||||
if 'password' in data:
|
if 'password' in data:
|
||||||
change = True
|
change = True
|
||||||
request.user.set_password(data['password'])
|
request.user.set_password(data['password'])
|
||||||
|
if 'script' in data:
|
||||||
|
profile = request.user.get_profile()
|
||||||
|
profile.preferences['script'] = data['script']
|
||||||
|
profile.save()
|
||||||
if change:
|
if change:
|
||||||
request.user.save()
|
request.user.save()
|
||||||
if errors:
|
if errors:
|
||||||
|
|
|
@ -13,7 +13,7 @@ pandora.ui.onloadDialog = function() {
|
||||||
+ 'If you ever need to manually change or remove it, '
|
+ 'If you ever need to manually change or remove it, '
|
||||||
+ 'you can do so by pandora.UI.set({onload: ""}) in the console.\n*/'),
|
+ 'you can do so by pandora.UI.set({onload: ""}) in the console.\n*/'),
|
||||||
type: 'textarea',
|
type: 'textarea',
|
||||||
value: pandora.user.ui.onload || '',
|
value: pandora.user.script || '',
|
||||||
width: dialogWidth - 32
|
width: dialogWidth - 32
|
||||||
})
|
})
|
||||||
.css({margin: '16px'}),
|
.css({margin: '16px'}),
|
||||||
|
@ -62,14 +62,14 @@ pandora.ui.onloadDialog = function() {
|
||||||
}
|
}
|
||||||
|
|
||||||
function clear() {
|
function clear() {
|
||||||
pandora.UI.set({onload: ''});
|
pandora.api.editPreferences({script: ''});
|
||||||
$input.options({value: ''});
|
$input.options({value: ''});
|
||||||
}
|
}
|
||||||
|
|
||||||
that.superClose = that.close;
|
that.superClose = that.close;
|
||||||
that.close = function() {
|
that.close = function() {
|
||||||
var value = $input.value();
|
var value = $input.value();
|
||||||
pandora.UI.set({onload: value || ''});
|
pandora.api.editPreferences({script: value || ''});
|
||||||
that.superClose();
|
that.superClose();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1970,9 +1970,9 @@ pandora.isVideoView = function(view, item) {
|
||||||
};
|
};
|
||||||
|
|
||||||
pandora.loadUserScript = function() {
|
pandora.loadUserScript = function() {
|
||||||
if (pandora.user.ui.onload) {
|
if (pandora.user.script) {
|
||||||
try {
|
try {
|
||||||
eval(pandora.user.ui.onload);
|
eval(pandora.user.script);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
Ox.print('user onload script error', e);
|
Ox.print('user onload script error', e);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue