#225 fixed field deletion

AtlasOfLivingAustralia · Nov 23, 2023 · e00334c · e00334c
1 parent 0c2264b
commit e00334c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 24 deletions.
diff --git a/grails-app/controllers/au/org/ala/spatial/ManageLayersController.groovy b/grails-app/controllers/au/org/ala/spatial/ManageLayersController.groovy
@@ -393,7 +393,12 @@ class ManageLayersController {
      */
     @RequireAdmin
     def delete(String id, String action) {
-        if (fieldService.getFieldById(id, false) == null) {
+        def field = fieldService.getFieldById(id, false)
+        if (field) {
+            def layerId = field.spid
+            manageLayersService.deleteField(id)
+            redirect(action: action, id: layerId)
+        } else {
             Map m = manageLayersService.getUpload(id, false)
             if (m == null || (!m.containsKey('data_resource_uid') && !m.containsKey('checklist'))) {
                 manageLayersService.deleteLayer(id)
@@ -403,11 +408,6 @@ class ManageLayersController {
                 manageLayersService.deleteChecklist(id)
             }
             redirect(action: action)
-        } else {
-            def layerId = fieldService.getFieldById(id, false).spid
-            manageLayersService.deleteField(id)
-
-            redirect(action: action, id: layerId)
         }
     }
 

diff --git a/grails-app/services/au/org/ala/spatial/ManageLayersService.groovy b/grails-app/services/au/org/ala/spatial/ManageLayersService.groovy
@@ -635,7 +635,7 @@ class ManageLayersService {
         String layersDir = spatialConfig.data.dir
 
         //fields
-        Fields field = fieldService.getFieldById(fieldId)
+        Fields field = fieldService.getFieldById(fieldId, false)
         if (field != null) {
 
             fieldService.delete(fieldId)

diff --git a/grails-app/views/manageLayers/field.gsp b/grails-app/views/manageLayers/field.gsp
@@ -109,13 +109,8 @@
                                             edit</g:link>
                                     </td>
                                     <td>
-                                        <g:if test="${item.enabled}">
-                                            <a onclick="return confirmDelete('${item.id}','${item.name}' );">
-                                                <i class="glyphicon glyphicon-remove"></i> </a>
-                                        </g:if>
-                                        <g:else>
-                                            <i class="glyphicon glyphicon-ban-circle" data-toggle="tooltip" data-placement="top" title="You are not allowed to delete a disabled field."></i>
-                                        </g:else>
+                                        <a onclick="return confirmDelete('${item.id}','${item.name}' );">
+                                            <i class="glyphicon glyphicon-remove"></i> </a>
                                     </td>
                                 </tr>
                             </g:each>

diff --git a/grails-app/views/manageLayers/layer.gsp b/grails-app/views/manageLayers/layer.gsp
@@ -101,13 +101,8 @@
                                        </g:link>
                                     </td>
                                     <td>
-                                        <g:if test="${item.enabled}">
-                                            <a onclick="return confirmDelete('${item.id}','${item.name}' );">
-                                                <i class="glyphicon glyphicon-remove"></i> </a>
-                                        </g:if>
-                                        <g:else>
-                                            <i class="glyphicon glyphicon-ban-circle" data-toggle="tooltip" data-placement="top" title="You are not allowed to delete a disabled field."></i>
-                                        </g:else>
+                                        <a onclick="return confirmDelete('${item.id}','${item.name}' );">
+                                            <i class="glyphicon glyphicon-remove"></i> </a>
                                     </td>
                                 </tr>
                             </g:each>

diff --git a/grails-app/views/manageLayers/layers.gsp b/grails-app/views/manageLayers/layers.gsp
@@ -56,10 +56,11 @@
         <tbody>
         <g:each var="item" in="${layers}">
             <tr>
+                <g:set var="disabledLayer" value="${item.enabled ? '' :'disabled'}" />
                 <td>${item.dt_added}</td>
-                <td>${item.id}</td>
-                <td>${item.name}</td>
-                <td>${item.displayname}</td>
+                <td  class="${disabledLayer}" >${item.id}</td>
+                <td  class="${disabledLayer}" >${item.name}</td>
+                <td  class="${disabledLayer}" >${item.displayname}</td>
                 <td>${item.enabled}</td>
                 <td>
                     <g:each in="${item.fields}" var="field" status="i">