Changeset 2017

Timestamp:

07/18/09 00:15:57 (3 years ago)

Author:

mswertz

Message:

Enhancements on security en hidden

Location:

molgenis3_3/src/org/molgenis

Files:

• framework/data/jdbc/JDBCDatabase.java (modified) (1 diff)
• framework/screen/form/FormController.java (modified) (2 diffs)
• framework/screen/form/FormScreen.java (modified) (2 diffs)
• framework/style/original/FormScreen.ftl (modified) (1 diff)
• generators/html/HtmlFormGen.java.ftl (modified) (1 diff)

molgenis3_3/src/org/molgenis/framework/data/jdbc/JDBCDatabase.java

@@ -563 +563 @@
                 for (E entity : entities)
                 {
-                        if (!security.hasEditPermission(entity)) throw new DatabaseException("Edit not allowed");
+                        if (!security.editAllowed(entity)) throw new DatabaseException("Edit not allowed");
                 }
         }

molgenis3_3/src/org/molgenis/framework/screen/form/FormController.java

@@ -398 +398 @@
 
                 // set form level rights
-                boolean formReadonly = view.isReadonly() || !view.getSecurity().hasEditPermission(view.create().getClass());
+                boolean formReadonly = view.isReadonly() || !view.getSecurity().editAllowed(view.create().getClass());
                 view.setReadonly(formReadonly);
 
@@ -411 +411 @@
                 for (E record : allRecords)
                 {
-                        boolean rowReadonly = formReadonly || !view.getSecurity().hasEditPermission(record.getClass());
+                        boolean rowReadonly = formReadonly || !view.getSecurity().editAllowed(record.getClass());
 
                         if (rowReadonly) record.setReadonly(true);

molgenis3_3/src/org/molgenis/framework/screen/form/FormScreen.java

@@ -278 +278 @@
         public boolean isVisible()
         {
-                return this.getSecurity().hasReadPermission(this.create().getClass());
+                return this.getSecurity().readAllowed(this.create().getClass());
         }
 
@@ -406 +406 @@
                         {
                                 HtmlForm<E> record = getInputs(entity, false);
-                                record.setReadonly(!getSecurity().hasEditPermission(entity));
+                                record.setReadonly(!getSecurity().editAllowed(entity));
                                 records.add(record);
                         }

molgenis3_3/src/org/molgenis/framework/style/original/FormScreen.ftl

@@ -74 +74 @@
                 <!--search box-->
                 <label>Search:</label><select title="choose attribute" name="__filter_attribute">
-                <#list screen.getNewRecordForm().inputs as input>
+                <#list screen.getNewRecordForm().inputs as input><#if !input.hidden>
                         <option value="${screen.getSearchField(input.name)}">${input.label}</option>
-                </#list>
+                </#if></#list>
                 </select>
                 <select title="choose search operator" name="__filter_operator">

molgenis3_3/src/org/molgenis/generators/html/HtmlFormGen.java.ftl

@@ -69 +69 @@
                         </#if>
                         <#if field.hidden>              
-                        input.setHidden(<#if field.auto && field.readOnly>true<#else>!isNewRecord()</#if>);
+                        input.setHidden(<#if (field.auto && field.readOnly) || (field.defaultValue?exists)>true<#else>!isNewRecord()</#if>);
                         </#if>                  
                         inputs.add(input);