Changeset 6076

Timestamp:

Jul 31, 2012, 11:03:27 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Merged patch release 3.1.2 to the trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/core/net/sf/basedb/core/Job.java (modified) (3 diffs)
• src/core/net/sf/basedb/core/Project.java (modified) (1 diff)
• www/biomaterials/bioplates/wells/list_biowells.jsp (modified) (3 diffs)
• www/common/overview/info.jsp (modified) (3 diffs)
• www/include/styles/main.css (modified) (1 diff)
• www/include/styles/table.css (modified) (1 diff)
• www/my_base/projects/items/list_items.jsp (modified) (1 diff)
• www/views/items/list_items.jsp (modified) (1 diff)
• www/views/trashcan/list_trash.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/Job.java

@@ -946 +946 @@
   /**
     Set the progress of the job. The job must be in the {@link Status#EXECUTING} or
-    {@link Status#PREPARED} status.
+    {@link Status#PREPARED} status. -1 can be used as a special value to indicate that
+    it is not known how far the job has progressed.
     @param percentComplete The number of percent completed
     @param statusMessage A message
@@ -952 +953 @@
       write permission of the job isn't in the <code>EXECUTING</code> status
     @throws InvalidDataException If the status message is too long or the
-      percentage value isn't between 0 and 100
+      percentage value isn't between -1 and 100
   */
   public void setProgress(int percentComplete, String statusMessage)
@@ -962 +963 @@
       throw new PermissionDeniedException("Cannot set progress for a job with status '"+getStatus()+"': "+toString());
     }
-    if (percentComplete < 0 || percentComplete > 100) 
-    {
-      throw new NumberOutOfRangeException("percentComplete", percentComplete, 0, 100);
+    if (percentComplete < -1 || percentComplete > 100) 
+    {
+      throw new NumberOutOfRangeException("percentComplete", percentComplete, -1, 100);
     }
     JobData data = getData();

trunk/src/core/net/sf/basedb/core/Project.java

@@ -245 +245 @@
   {
     int projectPermission = getSessionControl().getProjectPermission(this);
-    granted |= projectPermission & Permission.grant(Permission.READ, Permission.USE);
+    granted |= projectPermission;
     super.initPermissions(granted, denied);
   }

trunk/www/biomaterials/bioplates/wells/list_biowells.jsp

@@ -268 +268 @@
         id="bioMaterial.name"
         property="$mbm.name"
+        exportproperty="bioMaterial.name"
         datatype="string"
         title="[Biomtrl] Name"
@@ -277 +278 @@
         id="bioMaterial.description"
         property="$mbm.description"
+        exportproperty="bioMaterial.description"
         datatype="string"
         title="[Biomtrl] Description" 
@@ -286 +288 @@
         id="bioMaterial.entryDate"
         property="$evt.entryDate"
+        exportproperty="bioMaterial.creationEvent.entryDate"
         datatype="date"
         title="[Biomtrl] Registered"

trunk/www/common/overview/info.jsp

@@ -53 +53 @@
   import="net.sf.basedb.clients.web.extensions.JspContext"
   import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
+  import="net.sf.basedb.clients.web.formatter.FormatterFactory"
   import="net.sf.basedb.util.Values"
   import="net.sf.basedb.util.NestedIterator"
+  import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.util.overview.GenericOverview"
   import="net.sf.basedb.util.overview.OverviewUtil"
@@ -441 +443 @@
               {
                 Annotation a = snapshot.getAnnotation(dc);
-                String unitSymbol = a.hasUnit() ? " " + a.getUnitSymbol(null) : "";
-                AnnotationType at = at = snapshot.getAnnotationType(dc);
+                AnnotationType at = snapshot.getAnnotationType(dc);
+                Formatter formatter = FormatterFactory.getAnnotationFormatter(sc, a, null);
                 Annotatable annotationOwner = null;
                 try
@@ -484 +486 @@
                     %>
                   </tbl:cell>
-                  <tbl:cell column="values"><%=Values.getString(a.getValues(null), ", ", true)%><%=unitSymbol%></tbl:cell>
+                  <tbl:cell column="values"><%=Values.getString(a.getValues(null), ", ", true, formatter)%></tbl:cell>
                   <tbl:cell column="edit"><base:icon image="edit.png" onclick="<%=editLink%>" 
                     tooltip="<%=editTooltip%>" visible="<%=editLink != null %>"/></tbl:cell>

trunk/www/include/styles/main.css

@@ -570 +570 @@
   border-top: 1px solid #2288AA !important;
   border-bottom: 1px solid #2288AA !important;
+  transition: all 0.3s ease 0.1s;
+  -moz-transition: all 0.3s ease 0.1s;
+  -webkit-transition: all 0.3s ease 0.1s;
 }
 

trunk/www/include/styles/table.css

@@ -181 +181 @@
 .itemlist div.data > table > tbody.rows > tr
 {
+  border-top: 1px dotted #A0A0A0;
   border-bottom: 1px dotted #A0A0A0;
 }

trunk/www/my_base/projects/items/list_items.jsp

@@ -340 +340 @@
                 image="check_uncheck.png" 
                 tooltip="Check/uncheck all" 
-                onclick="Forms.checkUncheck(document.forms[formId])" 
+                onclick="Forms.checkUncheck(document.forms[formId], /item:/)" 
               /></tbl:header>
             <tbl:header 

trunk/www/views/items/list_items.jsp

@@ -327 +327 @@
                 image="check_uncheck.png" 
                 tooltip="Check/uncheck all" 
-                onclick="Forms.checkUncheck(document.forms[formId])" 
+                onclick="Forms.checkUncheck(document.forms[formId], /item:/)" 
               /></tbl:header>
             <tbl:header 

trunk/www/views/trashcan/list_trash.jsp

@@ -279 +279 @@
                 image="check_uncheck.png" 
                 tooltip="Check/uncheck all" 
-                onclick="Forms.checkUncheck(document.forms[formId])" 
+                onclick="Forms.checkUncheck(document.forms[formId], /item:/)" 
               /></tbl:header>
             <tbl:header