Merge pull request #361 from aodn/show_pinger_sensors

Once deployed #347 can be closed, which will eventually alleviate the duplicates observed in #240
aodn · Dec 21, 2016 · 68565b6 · 68565b6
2 parents 68d5e0d + e874352
commit 68565b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/grails-app/views/tag/edit.gsp b/grails-app/views/tag/edit.gsp
@@ -133,21 +133,23 @@
                                       </tr>
                                     </thead>
                                     <tbody id="sensor_table_body">
-                                      <g:each in="${tagInstance.nonPingerSensors}" var="s">
+                                      <g:each in="${tagInstance.sensors}" var="s">
                                         <tr>
                                           <td class="rowButton">
                                             <g:link class="show" controller="sensor" action="show" id="${s?.id}"></g:link>
                                           </td>
-                                          <shiro:hasPermission permission="project:${tagInstance?.project?.id}:edit_children">
-                                            <td class="rowButton">
-                                              <g:link controller="sensor"
-                                                      action="delete"
-                                                      class="delete"
-                                                      params="[projectId:tagInstance?.project?.id]"
-                                                      id="${s?.id}"
-                                                      onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');">.</g:link>
-                                            </td>
-                                          </shiro:hasPermission>
+                                          <g:if test="${tagInstance.sensors.size() > 1}">
+                                              <shiro:hasPermission permission="project:${tagInstance?.project?.id}:edit_children">
+                                                  <td class="rowButton">
+                                                      <g:link controller="sensor"
+                                                              action="delete"
+                                                              class="delete"
+                                                              params="[projectId:tagInstance?.project?.id]"
+                                                              id="${s?.id}"
+                                                              onclick="return confirm('${message(code: 'default.button.delete.confirm.message', default: 'Are you sure?')}');">.</g:link>
+                                                  </td>
+                                              </shiro:hasPermission>
+                                          </g:if>
                                           <td>${s?.transmitterType}</td>
                                           <td>${s?.codeMap}</td>
                                           <td>${s?.pingCode}</td>

diff --git a/grails-app/views/tag/show.gsp b/grails-app/views/tag/show.gsp
@@ -98,7 +98,7 @@
                                   </tr>
                                 </thead>
                                 <tbody>
-                                  <g:each in="${tagInstance.nonPingerSensors}" var="s">
+                                  <g:each in="${tagInstance.sensors}" var="s">
                                     <tr>
                                       <td class="rowButton">
                                         <g:link class="show" controller="sensor" action="show" id="${s?.id}"></g:link>

diff --git a/web-app/css/main.css b/web-app/css/main.css
@@ -253,8 +253,8 @@ input:focus, select:focus, textarea:focus {
 /* This is for the delete icons which appear within tables, e.g. delete
  * measurement from animal release. */
 .rowButton a.delete {
-    /* background: url(../images/skin/database_delete.png) center no-repeat; */
-    display: none;
+     background: url(../images/skin/database_delete.png) center no-repeat;
+    /*display: none;*/
 }
 
 /* MESSAGES AND ERRORS */