Skip to content

Model field reference edit pre poulated selections #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stephguac wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Model field reference edit pre poulated selections #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6131f63
filter out previously selected items from options list
Aug 22, 2017
2060ebf
Check for property
Aug 22, 2017
2abcf07
Merge branch 'master' into model-field-reference-edit-pre-poulated-se…
stephguac Aug 22, 2017
8759fcd
Use _.find
Aug 25, 2017
f5d1e58
set scope.list to removeSelectedFromList
Aug 25, 2017
87d474c
Merge branch 'model-field-reference-edit-pre-poulated-selections' of …
Aug 25, 2017
0d345e1
Don’t check length
Aug 29, 2017
a09dfe8
Add check for scope.options.relationship
Sep 6, 2017
fa22e62
remove options.relationship
Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/app/dashboard/model/edit/ModelEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ angular.module('dashboard.Dashboard.Model.Edit', [
displayInfo = key;
} else {
var property = $scope.model.properties[key];
displayInfo = property.display;
if (property) displayInfo = property.display;
}

if (!displayInfo) {
Expand Down
20 changes: 18 additions & 2 deletions client/common/directives/ModelFieldReference/ModelFieldReference.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ angular.module('dashboard.directives.ModelFieldReference', [
if (!scope.data) scope.selected = {};
});

scope.$watch('selected.items', function() { // watch selected.items to ensure previously selected items are accounted for.
if (scope.selected.items) {
scope.refreshChoices();
}
});

function removeSelectedFromList(selected, list, id) {
var filteredList = _.reject(list, function(o) {
return _.find(selected, function(s) {
return o[id] === s[id];
})
});
return filteredList;
}

function replaceSessionVariables(string) {
if (typeof string !== 'string') return string;
try {
Expand Down Expand Up @@ -120,7 +135,7 @@ angular.module('dashboard.directives.ModelFieldReference', [
scope.refreshChoices = function(search) {
var model = Config.serverParams.models[scope.options.model];
var params = { 'filter[limit]': 100 }; //limit only 100 items in drop down list
params['filter[where]['+scope.options.searchField+'][like]'] = "%" + search + "%";
if (search) params['filter[where]['+scope.options.searchField+'][like]'] = "%" + search + "%";
if (scope.options.where) {
//Add additional filtering on reference results
var keys = Object.keys(scope.options.where);
Expand All @@ -140,7 +155,7 @@ angular.module('dashboard.directives.ModelFieldReference', [
if (scope.options.api) apiPath = replaceSessionVariables(scope.options.api);
GeneralModelService.list(apiPath, params, {preventCancel: true}).then(function(response) {
if (!response) return; //in case http request was cancelled by newer request
scope.list = response;
scope.list = removeSelectedFromList(scope.selected.items, response, scope.options.key);
if (scope.options.allowInsert) {
var addNewItem = {};
addNewItem[scope.options.searchField] = "[Add New Item]";
Expand Down Expand Up @@ -337,6 +352,7 @@ angular.module('dashboard.directives.ModelFieldReference', [
//For single record reference just assign null
scope.data = null;
}
scope.refreshChoices();
};

scope.$on('ngGridEventStartCellEdit', function () {
Expand Down