').css({height: '16px'}).appendTo($statistics);
+ function cleanupDate(value) {
+ if (/\d{2}-\d{2}-\d{4}/.test(value)) {
+ value = Ox.reverse(value.split('-')).join('-')
+ }
+ if (/\d{4}i\/\d{2}\/\d{d}/.test(value)) {
+ value = value.split('/').join('-')
+ }
+ if (/\d{2}\/\d{2}\/\d{4}/.test(value)) {
+ value = Ox.reverse(value.split('/')).join('-')
+ }
+ return value
+ }
+
function editMetadata(key, value) {
if (value != data[key]) {
+ var itemKey = Ox.getObjectById(pandora.site.itemKeys, key);
var edit = {id: isMultiple ? ui.listSelection : data.id};
if (key == 'title') {
edit[key] = value;
} else if (listKeys.indexOf(key) >= 0) {
edit[key] = value ? value.split(', ') : [];
+ } else if (specialListKeys.indexOf(key) > -1) {
+ edit[key] = value
+ ? Ox.decodeHTMLEntities(value).split('; ').map(Ox.encodeHTMLEntities)
+ : [];
} else {
edit[key] = value ? value : null;
}
+ if (itemKey && itemKey.type && itemKey.type[0] == 'date') {
+ edit[key] = edit[key].map(cleanupDate);
+ }
pandora.api.edit(edit, function(result) {
if (!isMultiple) {
var src;
@@ -425,20 +453,40 @@ pandora.ui.infoView = function(data, isMixed) {
return '
' + str + '';
}
- function formatLink(value, key) {
- return (Ox.isArray(value) ? value : [value]).map(function(value) {
+
+ function formatLink(value, key, linkValue) {
+ linkValue = linkValue || value
+ linkValue = Ox.isArray(linkValue) ? linkValue: [linkValue]
+ return (Ox.isArray(value) ? value : [value]).map(function(value, idx) {
return key
- ? '
' + value + ''
+ ? '
' + value + ''
: value;
- }).join(', ');
+ }).join(Ox.contains(specialListKeys, key) ? '; ' : ', ');
}
function formatValue(key, value) {
var ret;
if (nameKeys.indexOf(key) > -1) {
ret = formatLink(value.split(', '), 'name');
+ } else if (
+ listKeys.indexOf(key) > -1 && Ox.getObjectById(pandora.site.itemKeys, key).type[0] == 'date'
+ ) {
+ ret = value.split('; ').map(function(date) {
+ date = cleanupDate(date)
+ return date ? formatLink(Ox.formatDate(date,
+ ['', '%Y', '%B %Y', '%B %e, %Y'][date.split('-').length],
+ true
+ ), key, date) : '';
+ }).join('; ');
} else if (listKeys.indexOf(key) > -1) {
ret = formatLink(value.split(', '), key);
+ } else if (specialListKeys.indexOf(key) > -1) {
+ ret = formatLink(
+ Ox.decodeHTMLEntities(value).split('; ').map(Ox.encodeHTMLEntities),
+ key
+ );
} else if (['year', 'country'].indexOf(key) > -1) {
ret = formatLink(value, key);
} else {
@@ -458,6 +506,7 @@ pandora.ui.infoView = function(data, isMixed) {
function getValue(key, value) {
return !value ? ''
+ : Ox.contains(specialListKeys, key) ? value.join('; ')
: Ox.contains(listKeys, key) ? value.join(', ')
: value;
}
diff --git a/update.py b/update.py
index e40f240b..40c2532b 100755
--- a/update.py
+++ b/update.py
@@ -121,6 +121,11 @@ def run_git(path, *args):
def get_version(path):
return run_git(path, 'rev-list', 'HEAD', '--count')
+def get_branch(path=None):
+ if not path:
+ path = '.'
+ return get('cat', os.path.join(path, '.git/HEAD')).strip().split('/')[-1]
+
if __name__ == "__main__":
base = os.path.normpath(os.path.abspath(os.path.dirname(__file__)))
@@ -254,49 +259,38 @@ if __name__ == "__main__":
run('./pandora/manage.py', 'createcachetable')
else:
if len(sys.argv) == 1:
- release = get_release()
- repos = release['repositories']
+ branch = get_branch()
+ development = branch == 'master'
+ elif len(sys.argv) == 3 and sys.argv[1] == 'switch':
+ branch = sys.argv[2]
development = False
else:
- release = {
- 'date': 'development'
- }
+ branch = 'master'
development = True
os.chdir(base)
current = ''
new = ''
- if development:
- if get('git', 'symbolic-ref', 'HEAD').strip().split('/')[-1] != 'master':
- print('update only possible if you are on master branch')
- sys.exit(1)
for repo in sorted(repos, key=lambda r: repos[r]['path']):
path = os.path.join(base, repos[repo]['path'])
if exists(path):
os.chdir(path)
+ current_branch = get_branch(path)
+ if current_branch != branch:
+ run('git', 'checkout', branch)
revno = get_version(path)
if repo == 'pandora':
pandora_old_revno = revno
current += revno
url = repos[repo]['url']
- if 'revision' in repos[repo]:
- if revno != repos[repo]['revision']:
- run('git', 'fetch')
- run('git', 'checkout', repos[repo]['commit'])
- else:
- print('Checking', repo)
- #run('git', 'checkout', 'master', '-q')
- run('git', 'pull')
+ print('Checking', repo)
+ run('git', 'pull')
revno = get_version(path)
new += revno
if repo == 'pandora':
pandora_new_revno = revno
else:
os.chdir(os.path.dirname(path))
- if 'revision' in repos[repo]:
- run('git', 'clone', repos[repo]['url'])
- run_git(path, 'checkout', repos[repo]['commit'])
- else:
- run('git', 'clone', '--depth', '1', repos[repo]['url'])
+ run('git', 'clone', '--depth', '1', repos[repo]['url'])
setup = os.path.join(base, repos[repo]['path'], 'setup.py')
if repo in ('python-ox', 'oxtimelines') and os.path.exists(setup):
os.chdir(os.path.dirname(setup))
@@ -317,7 +311,7 @@ if __name__ == "__main__":
'BEGIN;\n-- Model missing for table: cache\nCOMMIT;'
]:
print('Database has changed, please make a backup and run %s db' % sys.argv[0])
- elif not development:
- print('pan.do/ra is at the latest release,\nyou can run "%s dev" to update to the development version' % sys.argv[0])
+ elif branch != 'master':
+ print('pan.do/ra is at the latest release,\nyou can run "%s switch master" to switch to the development version' % sys.argv[0])
elif current != new:
reload_notice(base)
diff --git a/vm/pandora_install.sh b/vm/pandora_install.sh
index a1f66fa0..342010cd 100755
--- a/vm/pandora_install.sh
+++ b/vm/pandora_install.sh
@@ -4,6 +4,7 @@ PANDORA=${PANDORA-pandora}
POSTGRES=${POSTGRES-local}
RABBITMQ=${RABBITMQ-local}
NGINX=${NGINX-local}
+BRANCH=${BRANCH-stable}
echo Installing pandora with user: $PANDORA
getent passwd $PANDORA > /dev/null 2>&1 || adduser --disabled-password --gecos "" $PANDORA
@@ -111,6 +112,7 @@ fi
#pandora
git clone https://git.0x2620.org/pandora.git /srv/pandora
cd /srv/pandora
+git checkout $BRANCH
./ctl init
HOST=$(hostname -s)