Moved from ext-3.0-rc2 to ext-3.0.0.

diff --git a/htsworkflow/frontend/inventory/models.py b/htsworkflow/frontend/inventory/models.py
index 444d3c5f6c6009f5793e5b2131d6dd1eb0d63cd8..32acf8270f4d77ac74af7b93891c1bd4f6803c89 100644 (file)
--- a/htsworkflow/frontend/inventory/models.py
+++ b/htsworkflow/frontend/inventory/models.py
@@ -100,7 +100,7 @@ class Item(models.Model):
     
     #Automatically assigned uuid; used for barcode if one is not provided in
     # barcode_id
-    uuid = models.CharField(max_length=32, blank=True, help_text="Leave blank for automatic UUID generation")
+    uuid = models.CharField(max_length=32, blank=True, help_text="Leave blank for automatic UUID generation", unique=True)
     
     # field for existing barcodes; used instead of uuid if provided
     barcode_id = models.CharField(max_length=256, blank=True, null=True)

diff --git a/htsworkflow/frontend/templates/app_base.html b/htsworkflow/frontend/templates/app_base.html
index 30ef5704d8b64726517748d7966fc4bc1c7dcae2..8ff3d96d0c4100eaf0d2b53f71bd26687df36a1f 100644 (file)
--- a/htsworkflow/frontend/templates/app_base.html
+++ b/htsworkflow/frontend/templates/app_base.html
@@ -9,10 +9,10 @@
     
     <!-- App Stuff -->
     <link type="text/css" rel="stylesheet" href="/static/css/app.css" />
-    <link rel="stylesheet" type="text/css" href="/static/js/ext-3.0-rc2/resources/css/ext-all.css" />
+    <link rel="stylesheet" type="text/css" href="/static/js/ext-3.0.0/resources/css/ext-all.css" />
     <script type="text/javascript" src="/static/js/jquery-1.3.2.min.js"></script>
-    <script type="text/javascript" src="/static/js/ext-3.0-rc2/adapter/jquery/ext-jquery-adapter.js"></script>
-    <script type="text/javascript" src="/static/js/ext-3.0-rc2/ext-all.js"></script>
+    <script type="text/javascript" src="/static/js/ext-3.0.0/adapter/jquery/ext-jquery-adapter.js"></script>
+    <script type="text/javascript" src="/static/js/ext-3.0.0/ext-all.js"></script>
     <!--<script type="text/javascript" src="/static/js/menu.js"></script>-->
     
     {% block additional_javascript %}