0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

fix import state before import started

Browse source
This commit is contained in:
j 2016-01-25 12:18:24 +05:30
parent 26f2a40601
commit ceffe456db
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
oml/item/api.py
View file

@ -328,8 +328,11 @@ def _import(data):
mode copy|move mode copy|move
} }
''' '''
if 'cancel' in state.activity: if os.path.exists(data['path']):
del state.activity['cancel'] state.activity = {
'activity': 'import',
'path': data['path'],
}
state.tasks.queue('import', data) state.tasks.queue('import', data)
return {} return {}
actions.register(_import, 'import', cache=False) actions.register(_import, 'import', cache=False)

1
oml/item/scan.py
View file

@ -233,6 +233,7 @@ def run_import(options=None):
remove_empty_folders(prefix, True) remove_empty_folders(prefix, True)
def import_folder(): def import_folder():
if not (state.activity and state.activity.get('activity') == 'import'):
import_path = settings.preferences['importPath'] import_path = settings.preferences['importPath']
logger.debug('scan importPath %s', import_path) logger.debug('scan importPath %s', import_path)
if os.path.exists(import_path): if os.path.exists(import_path):

1
static/js/importExportDialog.js
View file

@ -111,6 +111,7 @@ oml.ui.importExportDialog = function() {
: renderForm('export', isActive) : renderForm('export', isActive)
); );
that.options({content: $outerPanel}); that.options({content: $outerPanel});
setButton(result.data);
}); });
}); });