From 53ef48ecca6a7c7a9c04f92bea15def568cd2a8e Mon Sep 17 00:00:00 2001 From: Brandon King Date: Mon, 29 Jun 2009 21:38:44 +0000 Subject: [PATCH] Activating bcmagic model & initial data. --- htsworkflow/frontend/fixtures/bcmagic.xml | 28 +++++++++++++++++++ .../frontend/fixtures/initial_data.xml | 28 +++++++++++++++++++ htsworkflow/frontend/settings.py | 1 + htsworkflow/frontend/static/js/htsw.js | 1 - 4 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 htsworkflow/frontend/fixtures/bcmagic.xml create mode 100644 htsworkflow/frontend/fixtures/initial_data.xml diff --git a/htsworkflow/frontend/fixtures/bcmagic.xml b/htsworkflow/frontend/fixtures/bcmagic.xml new file mode 100644 index 0000000..59dd041 --- /dev/null +++ b/htsworkflow/frontend/fixtures/bcmagic.xml @@ -0,0 +1,28 @@ + + + + frzr + (?P<uuid>[A-Fa-f0-9]+) + /samples/freezer/{{ uuid }}/ + + + cntr + (?P<uuid>[A-Fa-f0-9]+) + /samples/container/{{ uuid }}/ + + + s + (?P<sampleid>\d+)\|(?P<owner>[A-Za-z0-9_\- ]+) + /samples/sample/{{ sampleid }}/ + + + gg + (?P<search>[\S\s]+) + http://www.google.com/search?q={{ search }} + + + flickr + (?P<search>[\S\s]+) + http://www.flickr.com/search/?q={{ search }} + + diff --git a/htsworkflow/frontend/fixtures/initial_data.xml b/htsworkflow/frontend/fixtures/initial_data.xml new file mode 100644 index 0000000..b0761a6 --- /dev/null +++ b/htsworkflow/frontend/fixtures/initial_data.xml @@ -0,0 +1,28 @@ + + + + frzr + (?P<uuid>[A-Fa-f0-9]+) + /samples/freezer/{{ uuid }}/ + + + cntr + (?P<uuid>[A-Fa-f0-9]+) + /samples/container/{{ uuid }}/ + + + s + (?P<sampleid>\d+)\|(?P<owner>[A-Za-z0-9_\- ]+) + /samples/sample/{{ sampleid }}/ + + + gg + (?P<search>[\S\s]+) + http://www.google.com/search?q={{ search }} + + + flickr + (?P<search>[\S\s]+) + http://www.flickr.com/search/?q={{ search }} + + diff --git a/htsworkflow/frontend/settings.py b/htsworkflow/frontend/settings.py index 42d091a..17cdf23 100644 --- a/htsworkflow/frontend/settings.py +++ b/htsworkflow/frontend/settings.py @@ -161,6 +161,7 @@ INSTALLED_APPS = ( 'htsworkflow.frontend.analysis', 'htsworkflow.frontend.reports', 'htsworkflow.frontend.inventory', + 'htsworkflow.frontend.bcmagic', 'django.contrib.databrowse', ) diff --git a/htsworkflow/frontend/static/js/htsw.js b/htsworkflow/frontend/static/js/htsw.js index 6f00cb1..4be8a5d 100644 --- a/htsworkflow/frontend/static/js/htsw.js +++ b/htsworkflow/frontend/static/js/htsw.js @@ -224,7 +224,6 @@ $(document).ready(function(){ //---------------------------------------- // ExtJS Barcode Magic Implementation var bcmagic_ext_keyhandler = function(sObj, e){ - //e.preventDefault(); //Process upon enter key as input. if (e.getKey() == e.ENTER) bcmagic_process(); -- 2.30.2