HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2015-12-23 0be76b6c234dcb3e0921cb875ac1aeba95593f35
some property names are overwritten in api
3 files modified
9 ■■■■ changed files
hsarback/src/de/hsadmin/core/model/AnnFieldIO.java 1 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/user/UnixUser.java 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/remote/PropertyRemote.java 4 ●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/core/model/AnnFieldIO.java
@@ -13,4 +13,5 @@
    Class<?> referTo() default Void.class;
    Class<? extends DefaultSelectableValues> selectableValues() default DefaultSelectableValues.class;
    String[] referredProps() default { };
    String overwriteName() default "";
}
hsarback/src/de/hsadmin/mods/user/UnixUser.java
@@ -69,11 +69,11 @@
    @Column(name = "locked", columnDefinition = "boolean")
    private boolean locked;
    @AnnFieldIO(validation="[0-9]*", rw=ReadWriteAccess.READWRITE)
    @AnnFieldIO(validation="[0-9]*", rw=ReadWriteAccess.READWRITE, overwriteName="quota_softlimit")
    @Column(name = "quota_softlimit", columnDefinition = "integer")
    private Integer quotaSoftlimit;
    @AnnFieldIO(validation="[0-9]*", rw=ReadWriteAccess.READWRITE)
    @AnnFieldIO(validation="[0-9]*", rw=ReadWriteAccess.READWRITE, overwriteName="quota_hardlimit")
    @Column(name = "quota_hardlimit", columnDefinition = "integer")
    private Integer quotaHardlimit;
hsarback/src/de/hsadmin/remote/PropertyRemote.java
@@ -40,6 +40,10 @@
                            if (fieldIO != null) {
                                HashMap<String, Object> propertyProperties = new HashMap<String, Object>();
                                String fieldName = f.getName();
                                String overwrite = fieldIO.overwriteName();
                                if (overwrite != null && !overwrite.isEmpty()) {
                                    fieldName = overwrite;
                                }
                                propertyProperties.put("module", (String) moduleKey);
                                propertyProperties.put("name", fieldName);
                                propertyProperties.put("searchable", "equals");