Changeset 5156

Timestamp:

Oct 22, 2009, 9:09:52 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Merged pre-2.14-releases to the trunk

Location:

trunk

Files:

• credits.txt (modified) (1 diff)
• www/admin/annotationtypes/edit_annotationtype.jsp (modified) (1 diff)
• www/admin/annotationtypes/index.jsp (modified) (1 diff)

trunk/credits.txt

@@ -1 +1 @@
 $Id$
 
-The current BASE team is (at BASE 2.12.1 release)
+The current BASE team is (at BASE 2.14.0 release)
 {{{
 Jari Häkkinen

trunk/www/admin/annotationtypes/edit_annotationtype.jsp

@@ -80 +80 @@
     title = "Create annotation type";
     valueType = Type.valueOf(request.getParameter("value_type"));
-    if (valueType.isNumerical()) unitQuery = Unit.getQuery();
-    
-    int recentQuantityId = Values.getInt(cc.getRecent(Item.QUANTITY.name(), 0));
-    currentQuantityId = Values.getInt(cc.getPropertyValue("quantity"), recentQuantityId);
-
-    if (cc.getPropertyFilter("defaultUnit.name") != null)
-    {
-      Unit currentUnit = Base.getFirstMatching(dc, Unit.getQuery(), "name", cc.getPropertyFilter("defaultUnit.name"));
-      if (currentUnit != null) currentUnitId = currentUnit.getId();
-    }
-    if (currentUnitId == 0) currentUnitId = Values.getInt(cc.getRecent(Item.UNIT.name(), 0));
+    if (valueType.isNumerical()) unitQuery = Unit.getQuery(); 
     cc.removeObject("item");
   }

trunk/www/admin/annotationtypes/index.jsp

@@ -278 +278 @@
         Unit unit = unitId == 0 ? null : Unit.getById(dc, unitId);
         annotationType.setDefaultUnit(unit);
-        if (unit != null) cc.setRecent(unit, maxRecent);
       }