Fixes #461 - Update button on finding edit screen isn't working properly

seccubus · Jun 28, 2017 · fab7058 · fab7058
1 parent af785c5
commit fab7058
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -157,6 +157,7 @@ Enhancements
 Bug Fixes
 ---------
 * #132 - We have CSRF protection now. Non-get requests should have content-type application/json.
+* #461 - Update button on finding edit screen isn't working properly
 * #474 - Some typo/style fixes by Jericho (attrition.org)
 * #478 - Conralive should check if cron isn't ignored
 * #480 - Editing/showing notifications broken

diff --git a/jmvc/seccubus/finding/bulkedit/bulkedit.js b/jmvc/seccubus/finding/bulkedit/bulkedit.js
@@ -78,6 +78,7 @@ $.Controller('Seccubus.Finding.Bulkedit',
 	 * default event and calls bulkUpdate to perform a bulk update
 	 */
 	submit : function(el, ev) {
+        console.log("Submit");
 		ev.preventDefault();
 		var params = this.element.formParams();
 		this.bulkUpdate();
@@ -123,6 +124,7 @@ $.Controller('Seccubus.Finding.Bulkedit',
 	 * This is the callback function for update on the list
 	 */
 	saved : function() {
+        console.log("Saved");
 		this.element.find('[type=submit]').val('Update');
 		this.element[0].reset();
 		// Update our view

diff --git a/jmvc/seccubus/finding/table/views/finding.ejs b/jmvc/seccubus/finding/table/views/finding.ejs
@@ -16,16 +16,16 @@
 	<% if (columns[i] == "") { %>
 		<% if(columns[i+1] == "Action") { %>
 			<td>
-			    <% if ( ! noEdit ) { %> 
+			    <% if ( typeof(noEdit) == "undefined" || ! noEdit ) { %>
 					<img class='editFinding' src='img/edit.png'><br>
 				<% } %>
-			    <% if ( ! noLink ) { %> 
+			    <% if ( typeof(noLink) == "undefined" ||! noLink ) { %>
 					<img class='linkFinding' src='img/link.png'><br>
 				<% } %>
-			    <% if ( ! noFindingUnlink ) { %> 
+			    <% if ( typeof(noFindingUnlink) == "undefined" || ! noFindingUnlink ) { %>
 					<img class='unlinkFinding' src='img/unlink.png'><br>
 				<% } %>
-			    <% if ( ! noEdit ) { %> 
+                <% if ( typeof(noEdit) == "undefined" || ! noEdit ) { %>
 					<% if (status == 99 ) { %>
 						<a href='javascript://' value='1' class='small changeState'><img src='img/new.png'></a><br>
 					<% } %>
@@ -87,10 +87,10 @@
 					<% for ( x = 0; x < issues.length ; x++ ) { %>
 						<li>
 							<div title='<%= issues[x].description %>'>
-							    <% if ( ! noLink ) { %> 
-									<img class='editIssue' issueId='<%= issues[x].id %>' src='img/edit.png'>
+                                <% if ( typeof(noLink) == "undefined" ||! noLink ) { %>
+							    	<img class='editIssue' issueId='<%= issues[x].id %>' src='img/edit.png'>
 								<% } %>
-							    <% if ( ! noIssueUnlink ) { %> 
+							    <% if ( ! noIssueUnlink ) { %>
 									<img class='unlinkIssue' issueId='<%= issues[x].id %>' src='img/unlink.png'>
 								<% } %>
 								<%= issues[x].name %>