Skip to content

Commit 44bbbb5

Browse files
gabrielhtViniciusRomano
authored andcommitted
Merged in dev-3869-midiaexterna-multiselect (pull request #12)
multiselect-autocomplete & general Approved-by: VINICIUS DRAGO ROMANO
2 parents 41b590b + f92e198 commit 44bbbb5

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

src/directives/framework/lets-fw-multiselect.directive.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,12 @@
8888
})
8989
}
9090

91-
$scope.makeRequestAutocomplete = function (scope, value, route) {
91+
$scope.makeRequestAutocomplete = function (scope, value, route, isGeneral) {
9292
$timeout(function() {
9393
if(!value) value = '[blank]'
94+
var prefix = isGeneral ? 'general/': ''
9495
$scope.resource = Restangular.all($scope.route());
95-
$scope.resource.customGET('autocomplete/'+route+'/'+value+'?limit=10').then(function (data) {
96+
$scope.resource.customGET(prefix+'autocomplete/'+route+'/'+value+'?limit=10').then(function (data) {
9697
scope.options = $scope.removeDuplicates(data.concat(scope.selectedModel),'id');
9798

9899
$timeout(function() {},0)
@@ -123,17 +124,19 @@
123124
$scope.onInitMulti = function (event, field) {
124125
var dropdown = $(event.target)
125126
dropdown.scope().input.searchFilter = "";
127+
var route = field.customOptions.general ? field.customOptions.general : field.name
128+
var isGeneral = field.customOptions.general ? true : false
126129

127130
if (!dropdown.initMultiSelect) {
128131
var _scope = dropdown.scope()
129132
dropdown.initMultiSelect = true
130133
// Popular o msdata pela depois de iniciado
131-
$scope.makeRequestAutocomplete(_scope,'[blank]', field.name)
134+
$scope.makeRequestAutocomplete(_scope,'[blank]', route, isGeneral)
132135
dropdown.parent().find(".dropdown-header").append('<i class="glyphicon glyphicon-search" style=" position: absolute; top: 20px; right: 35px; "></i>')
133136

134137
// Chamar autocomplete toda vez que alguma coisa é digitada no search-filter
135138
_scope.$watch('input.searchFilter', $scope._debounce(function(data) {
136-
$scope.makeRequestAutocomplete(_scope,data,field.name)
139+
$scope.makeRequestAutocomplete(_scope,data,route, isGeneral)
137140
}))
138141

139142
// sim, precisa dessa gambiarra pra chumbar os evento e os textos

0 commit comments

Comments
 (0)