From: Brandon King <kingb@caltech.edu>
Date: Tue, 21 Jul 2009 22:53:42 +0000 (+0000)
Subject: Moved from ext-3.0-rc2 to ext-3.0.0.
X-Git-Tag: 0.2.6~5
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=980364bb107bebef6999113be3d256e0270500ba

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 444d3c5..32acf82 100644
--- 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 30ef570..8ff3d96 100644
--- 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 %}