Changeset 5152

Timestamp:

Oct 21, 2009, 2:39:54 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1412: The selected unit for an annotation type should not be remembered when creating a new annotation type

Location:

branches/2.14-stable/www/admin/annotationtypes

Files:

• edit_annotationtype.jsp (modified) (1 diff)
• index.jsp (modified) (1 diff)

branches/2.14-stable/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");
   }

branches/2.14-stable/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);
       }