MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: Potential fix to the template element adding issue throwing ajax only exceptions

pull/2379/merge
iglocska 2017-07-31 13:51:23 +02:00
parent ad8fc6a233
commit a2d716c4b1
8 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Controller/AppController.php
View File

@ -46,7 +46,7 @@ class AppController extends Controller {
public $helpers = array('Utility');
private $__queryVersion = '14';
private $__queryVersion = '15';
public $pyMispVersion = '2.4.77';
public $phpmin = '5.6.5';
public $phprec = '7.0.16';

2
app/View/TemplateElements/ajax/template_element_add_attribute.ctp
View File

@ -88,7 +88,7 @@
<table>
<tr>
<td style="vertical-align:top">
<span id="submitButton" role="button" tabindex="0" aria-label="Add attribute element" title="Add attribute element" class="btn btn-primary" onClick="submitPopoverForm('<?php echo $id;?>', 'addAttributeElement')">Submit</span>
<span id="submitButton" role="button" tabindex="0" aria-label="Add attribute element" title="Add attribute element" class="btn btn-primary" onClick="return submitPopoverForm('<?php echo $id;?>', 'addAttributeElement')">Submit</span>
</td>
<td style="width:540px;">
<p style="color:red;font-weight:bold;display:none;text-align:center" id="warning-message">Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this.</p>

2
app/View/TemplateElements/ajax/template_element_add_file.ctp
View File

@ -64,7 +64,7 @@
<table>
<tr>
<td style="vertical-align:top">
<button title="Submit the file element" id="submitButton" class="btn btn-primary" onClick="submitPopoverForm('<?php echo $id;?>', 'addFileElement');">Submit</button>
<button title="Submit the file element" id="submitButton" class="btn btn-primary" onClick="return submitPopoverForm('<?php echo $id;?>', 'addFileElement');">Submit</button>
</td>
<td style="width:540px;">
<p style="color:red;font-weight:bold;display:none;text-align:center" id="warning-message">Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this.</p>

2
app/View/TemplateElements/ajax/template_element_add_text.ctp
View File

@ -26,7 +26,7 @@
<table>
<tr>
<td style="vertical-align:top">
<button id="submitButton" title="Add text description element" class="btn btn-primary" onClick="submitPopoverForm('<?php echo $id;?>', 'addTextElement')">Submit</button>
<button id="submitButton" title="Add text description element" class="btn btn-primary" onClick="return submitPopoverForm('<?php echo $id;?>', 'addTextElement')">Submit</button>
</td>
<td style="width:540px;">
<p style="color:red;font-weight:bold;display:none;text-align:center" id="warning-message">Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this.</p>

2
app/View/TemplateElements/ajax/template_element_edit_attribute.ctp
View File

@ -89,7 +89,7 @@
<p style="color:red;font-weight:bold;display:none;text-align:center" id="warning-message">Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this.</p>
</td>
<td style="vertical-align:top;">
<button title="Cancel" class="btn btn-inverse" id="cancel_attribute_add" onClick="cancelPopoverForm();">Cancel</button>
<button title="Cancel" class="btn btn-inverse" id="cancel_attribute_add" onClick="return cancelPopoverForm();">Cancel</button>
</td>
</tr>
</table>

2
app/View/TemplateElements/ajax/template_element_edit_file.ctp
View File

@ -64,7 +64,7 @@
<table>
<tr>
<td style="vertical-align:top">
<button title="Submit file element changes" id="submitButton" class="btn btn-primary" onClick="event.preventDefault();submitPopoverForm('<?php echo $id;?>', 'editFileElement', '<?php echo $template_id; ?>');">Submit</button>
<button title="Submit file element changes" id="submitButton" class="btn btn-primary" onClick="return event.preventDefault();submitPopoverForm('<?php echo $id;?>', 'editFileElement', '<?php echo $template_id; ?>');">Submit</button>
</td>
<td style="width:540px;">
<p style="color:red;font-weight:bold;display:none;text-align:center" id="warning-message">Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this.</p>

2
app/View/TemplateElements/ajax/template_element_edit_text.ctp
View File

@ -26,7 +26,7 @@
<table>
<tr>
<td style="vertical-align:top">
<button id="submitButton" title="Submit description changes" class="btn btn-primary" onClick="event.preventDefault();submitPopoverForm('<?php echo $id;?>', 'editTextElement', '<?php echo $template_id; ?>')">Submit</button>
<button id="submitButton" title="Submit description changes" class="btn btn-primary" onClick="return event.preventDefault();submitPopoverForm('<?php echo $id;?>', 'editTextElement', '<?php echo $template_id; ?>')">Submit</button>
</td>
<td style="width:540px;">
<p style="color:red;font-weight:bold;display:none;text-align:center" id="warning-message">Warning: You are about to share data that is of a classified nature (Attribution / targeting data). Make sure that you are authorised to share this.</p>

1
app/webroot/js/misp.js
View File

@ -909,6 +909,7 @@ function submitPopoverForm(context_id, referer, update_context_id) {
url:url
});
}
return false;
};
function handleAjaxPopoverResponse(response, context_id, url, referer, context, contextNamingConvention) {