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

fix: [update] Function name conflict introduced by the merge + UI 

Improvements
pull/5462/head
mokaddem 2019-12-09 09:53:18 +01:00
parent a1fdea754d
commit 5ff9c29fb8
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/AppModel.php
View File

@ -244,7 +244,7 @@ class AppModel extends Model
$this->__addServerPriority();
break;
case 46:
$dbUpdateSuccess = $this->updateDatabase('seenOnAttributeAndObject', true);
$dbUpdateSuccess = $this->updateDatabase('seenOnAttributeAndObject');
break;
default:
$dbUpdateSuccess = $this->updateDatabase($command);
@ -2007,7 +2007,7 @@ class AppModel extends Model
public function getLockRemainingTime()
{
$lockState = $this->__getUpdateLockState();
$lockState = $this->getUpdateLockState();
if ($lockState !== false && $lockState !== '') {
// if lock is old, still allows the update
// This can be useful if the update process crashes

2
app/View/Elements/Events/View/row_object.ctp
View File

@ -161,6 +161,6 @@
'child' => $attrKey == $lastElement ? 'last' : true
));
}
echo '<tr><td style="position:absolute"><span class="fa fa-plus-circle objectAddField" title="' . __('Add an Object Attribute') .'" onclick="popoverPopup(this, ' . h($object['id']) . ', \'objects\', \'quickFetchTemplateWithValidObjectAttributes\')"></span></td></tr>';
echo '<tr class="objectAddFieldTr"><td><span class="fa fa-plus-circle objectAddField" title="' . __('Add an Object Attribute') .'" onclick="popoverPopup(this, ' . h($object['id']) . ', \'objects\', \'quickFetchTemplateWithValidObjectAttributes\')"></span></td></tr>';
}
?>

5
app/webroot/css/main.css
View File

@ -305,6 +305,11 @@ td.highlight3 {
}
table.table-striped > tbody > tr.objectAddFieldTr > td {
position: absolute;
background-color: #ffffff00;
}
table.table-striped > tbody > tr > td > span.objectAddField {
padding: 0px;
line-height: normal;