Skip to content

Commit 7ccd83c

Browse files
Firetawnyowlnekufa
authored andcommitted
rename entity to row
1 parent 3ab7b74 commit 7ccd83c

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Job\Entity;
3+
namespace Job\Row;
44

55
use Exception;
66
use stdClass;
@@ -38,7 +38,6 @@ public function run(): array
3838
}
3939
$values[$k] = $v;
4040
}
41-
$entity = $space->create($values);
42-
return ['entity' => $entity];
41+
return ['row' => $space->create($values)];
4342
}
4443
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Job\Entity;
3+
namespace Job\Row;
44

55
use Job\Space\Job as SpaceJob;
66

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Job\Entity;
3+
namespace Job\Row;
44

55
use Job\Space\Job;
66
use Exception;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Job\Entity;
3+
namespace Job\Row;
44

55
use Exception;
66
use stdClass;

public/admin/js/Space/Collection.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -194,12 +194,12 @@ Ext.define('Admin.Space.Collection', {
194194
});
195195
},
196196

197-
createEntityWindow(entity) {
197+
createWindow(row) {
198198
var id;
199199
var primary = this.indexes[0].parts.map(p => this.fields[(p[0] == undefined) ? p.field : p[0]]);
200200

201-
if (entity) {
202-
var key = primary.map(f => entity.get(f));
201+
if (row) {
202+
var key = primary.map(f => row.get(f));
203203

204204
id = key.length == 1 ? key[0] : '[' + key.join(', ') + ']';
205205
}
@@ -234,8 +234,8 @@ Ext.define('Admin.Space.Collection', {
234234
});
235235
}
236236

237-
if (entity) {
238-
item.value = entity.get(field.name);
237+
if (row) {
238+
item.value = row.get(field.name);
239239

240240
if (Ext.isObject(item.value) || Ext.isArray(item.value)) {
241241
if (complexTypes.indexOf(field.name) == -1) {
@@ -286,7 +286,7 @@ Ext.define('Admin.Space.Collection', {
286286
}
287287
}
288288

289-
var windowTitle = entity ? 'Update ' + this.params.space + ' ' + id : 'New ' + this.params.space;
289+
var windowTitle = row ? 'Update ' + this.params.space + ' ' + id : 'New ' + this.params.space;
290290

291291
if (window.configuration.readOnly) {
292292
windowTitle = 'Info for ' + this.params.space + ' ' + id;
@@ -305,11 +305,11 @@ Ext.define('Admin.Space.Collection', {
305305
bodyPadding: 10,
306306
items: columns.length > 1 ? columns : items,
307307
bbar: [ '->', {
308-
text: entity ? 'Update' : 'Create',
308+
text: row ? 'Update' : 'Create',
309309
formBind: true,
310310
hidden: window.configuration.readOnly,
311311
handler: () => {
312-
var job = entity ? 'entity.update' : 'entity.create';
312+
var job = row ? 'row.update' : 'row.create';
313313
var currentValues = win.down('form').getValues();
314314
var values = {};
315315

@@ -351,8 +351,8 @@ Ext.define('Admin.Space.Collection', {
351351
return win.close();
352352
}
353353

354-
if (entity) {
355-
primary.forEach(f => values[f] = entity.get(f));
354+
if (row) {
355+
primary.forEach(f => values[f] = row.get(f));
356356
}
357357

358358
var params = Ext.apply({

public/admin/js/Space/toolbar/Collection.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ Ext.define('Admin.Space.toolbar.Collection', {
113113
text: 'Create',
114114
iconCls: 'fa fa-plus-circle',
115115
handler() {
116-
this.up('grid').createEntityWindow();
116+
this.up('grid').createWindow();
117117
},
118118
}, {
119119
text: 'Update',
@@ -125,7 +125,7 @@ Ext.define('Admin.Space.toolbar.Collection', {
125125
.getSelected();
126126
var record = selected.startCell ? selected.startCell.record : selected.selectedRecords.items[0];
127127

128-
this.up('grid').createEntityWindow(record);
128+
this.up('grid').createWindow(record);
129129
},
130130
}, {
131131
text: 'Delete',
@@ -165,7 +165,7 @@ Ext.define('Admin.Space.toolbar.Collection', {
165165
return Ext.apply({ id: id }, grid.params);
166166
});
167167

168-
return dispatch.progress('entity.remove', params)
168+
return dispatch.progress('row.remove', params)
169169
.then(() => this.up('toolbar-collection').refreshStore());
170170
});
171171
},

0 commit comments

Comments
 (0)