Commit 9e7e5f05 by kevalbhatt Committed by Madhan Neethiraj

ATLAS-1524: improvements on create/edit entity UI

parent 30a8e228
...@@ -119,6 +119,9 @@ ...@@ -119,6 +119,9 @@
.select2-selection--multiple { .select2-selection--multiple {
background-color: $color_white_lilac_approx !important; background-color: $color_white_lilac_approx !important;
border: 1px $color_mystic_approx solid !important; border: 1px $color_mystic_approx solid !important;
&.errorClass {
border: 1px solid red !important;
}
} }
.select2-selection--single { .select2-selection--single {
.select2-selection__arrow { .select2-selection__arrow {
......
...@@ -385,7 +385,8 @@ legend.scheduler-border { ...@@ -385,7 +385,8 @@ legend.scheduler-border {
} }
.errorClass { .errorClass {
border: 1px solid red; border: 1px solid red !important;
box-shadow: none !important;
} }
.entityInputBox { .entityInputBox {
......
...@@ -347,6 +347,7 @@ define(['require', ...@@ -347,6 +347,7 @@ define(['require',
], function(CreateEntityLayoutView) { ], function(CreateEntityLayoutView) {
var view = new CreateEntityLayoutView({ var view = new CreateEntityLayoutView({
guid: that.id, guid: that.id,
entityDefCollection: that.entityDefCollection,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} }
......
...@@ -43,7 +43,7 @@ define(['require', ...@@ -43,7 +43,7 @@ define(['require',
* @constructs * @constructs
*/ */
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'globalVent', 'value', 'initialView')); _.extend(this, _.pick(options, 'value', 'initialView', 'entityDefCollection'));
}, },
bindEvents: function() {}, bindEvents: function() {},
onRender: function() { onRender: function() {
...@@ -64,7 +64,8 @@ define(['require', ...@@ -64,7 +64,8 @@ define(['require',
that.RSearchResultLayoutView.show(new SearchResultLayoutView({ that.RSearchResultLayoutView.show(new SearchResultLayoutView({
value: value, value: value,
tag: that.tag, tag: that.tag,
initialView: that.initialView initialView: that.initialView,
entityDefCollection: that.entityDefCollection
})); }));
} }
}); });
......
...@@ -122,7 +122,7 @@ define(['require', ...@@ -122,7 +122,7 @@ define(['require',
* @constructs * @constructs
*/ */
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'globalVent', 'vent', 'value', 'initialView')); _.extend(this, _.pick(options, 'value', 'initialView', 'entityDefCollection'));
var pagination = ""; var pagination = "";
this.entityModel = new VEntity(); this.entityModel = new VEntity();
this.searchCollection = new VSearchList(); this.searchCollection = new VSearchList();
...@@ -297,7 +297,6 @@ define(['require', ...@@ -297,7 +297,6 @@ define(['require',
require(['utils/TableLayout'], function(TableLayout) { require(['utils/TableLayout'], function(TableLayout) {
var columns = new Backgrid.Columns(that.getFixedDslColumn()); var columns = new Backgrid.Columns(that.getFixedDslColumn());
that.REntityTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, { that.REntityTableLayoutView.show(new TableLayout(_.extend({}, that.commonTableOptions, {
globalVent: that.globalVent,
columns: columns columns: columns
}))); })));
that.ui.paginationDiv.show(); that.ui.paginationDiv.show();
...@@ -622,6 +621,7 @@ define(['require', ...@@ -622,6 +621,7 @@ define(['require',
], function(CreateEntityLayoutView) { ], function(CreateEntityLayoutView) {
var view = new CreateEntityLayoutView({ var view = new CreateEntityLayoutView({
guid: guid, guid: guid,
entityDefCollection: that.entityDefCollection,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} }
...@@ -635,6 +635,7 @@ define(['require', ...@@ -635,6 +635,7 @@ define(['require',
'views/entity/CreateEntityLayoutView' 'views/entity/CreateEntityLayoutView'
], function(CreateEntityLayoutView) { ], function(CreateEntityLayoutView) {
var view = new CreateEntityLayoutView({ var view = new CreateEntityLayoutView({
entityDefCollection: that.entityDefCollection,
callback: function() { callback: function() {
that.fetchCollection(); that.fetchCollection();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment