Skip to content

Commit c66aa65

Browse files
committed
rename locked field to lock_events in feed model
1 parent fb76893 commit c66aa65

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

app/Controller/FeedsController.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,8 @@ public function add()
280280
if (empty($feed['Feed']['lookup_visible'])) {
281281
$feed['Feed']['lookup_visible'] = 0;
282282
}
283-
if (empty($feed['Feed']['locked'])) {
284-
$feed['Feed']['locked'] = 0;
283+
if (empty($feed['Feed']['lock_events'])) {
284+
$feed['Feed']['lock_events'] = 0;
285285
}
286286
if (empty($feed['Feed']['input_source'])) {
287287
$feed['Feed']['input_source'] = 'network';
@@ -383,7 +383,7 @@ public function edit($feedId)
383383
'headers',
384384
'orgc_id',
385385
'fixed_event',
386-
'locked'
386+
'lock_events'
387387
],
388388
'afterFind' => function (array $feed) {
389389
$feed['Feed']['settings'] = json_decode($feed['Feed']['settings'], true);

app/Model/AppModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2482,7 +2482,7 @@ public function updateDatabase($command)
24822482
$sqlArray[] = "ALTER TABLE `taxii_servers` MODIFY `api_key` TEXT NOT NULL";
24832483
break;
24842484
case 141:
2485-
$sqlArray[] = "ALTER TABLE `feeds` ADD `locked` tinyint(1) NOT NULL DEFAULT 0;";
2485+
$sqlArray[] = "ALTER TABLE `feeds` ADD `lock_events` tinyint(1) NOT NULL DEFAULT 0;";
24862486
break;
24872487
case 'fixNonEmptySharingGroupID':
24882488
$sqlArray[] = 'UPDATE `events` SET `sharing_group_id` = 0 WHERE `distribution` != 4;';

app/Model/Feed.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1061,7 +1061,7 @@ private function __prepareEvent($event, array $feed, $filterRules)
10611061
} else {
10621062
$event['Event']['distribution'] = $feed['Feed']['distribution'];
10631063
$event['Event']['sharing_group_id'] = $feed['Feed']['sharing_group_id'];
1064-
$event['Event']['locked'] = !empty($feed['Feed']['locked']) ? 1 : 0;
1064+
$event['Event']['lock_events'] = !empty($feed['Feed']['lock_events']) ? 1 : 0;
10651065
if ($feed['Feed']['sharing_group_id']) {
10661066
$sg = $this->SharingGroup->find('first', array(
10671067
'recursive' => -1,

app/View/Feeds/add.ctp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ echo $this->element('genericElements/Form/genericForm', [
3232
'type' => 'checkbox'
3333
],
3434
[
35-
'field' => 'locked',
35+
'field' => 'lock_events',
3636
'label' => __('Lock events'),
3737
'title' => __('Lock events created from this feed (allows sync users to edit them)'),
3838
'type' => 'checkbox'

db_schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3480,7 +3480,7 @@
34803480
"extra": ""
34813481
},
34823482
{
3483-
"column_name": "locked",
3483+
"column_name": "lock_events",
34843484
"is_nullable": "NO",
34853485
"data_type": "tinyint",
34863486
"character_maximum_length": null,

0 commit comments

Comments
 (0)