Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,16 @@ angular.module('choko')
$scope: $scope
});

// Parse query reference params.
Object.keys($scope.element.reference.query || {}).forEach(function(param) {
$scope.element.reference.query[param] = Params.parse($scope.element.reference.query[param], $scope);
});

// Parse other reference params.
Object.keys($scope.element.reference.params || {}).forEach(function(param) {
$scope.element.reference.params[param] = Params.parse($scope.element.reference.params[param], $scope);
});

var query = {
type: $scope.element.reference.type
};
Expand All @@ -95,7 +105,9 @@ angular.module('choko')
}

// Get reference items to make a options list.
Choko.get(query, function(response) {
$scope.element.options = Choko.get(query);

$scope.element.options.$promise.then(function(response) {
$scope.element.options = response;

// Use radios if less then 5 options.
Expand Down
14 changes: 12 additions & 2 deletions applications/default/public/js/controllers.js
Original file line number Diff line number Diff line change
Expand Up @@ -160,11 +160,16 @@ angular.module('choko')
$scope.view.itemKey = Params.parse($scope.view.itemKey, $scope);
}

// Parse other params.
Object.keys($scope.view.query || {}).forEach(function (param) {
// Parse query params.
Object.keys($scope.view.query || {}).forEach(function(param) {
$scope.view.query[param] = Params.parse($scope.view.query[param], $scope);
});

// Parse other params.
Object.keys($scope.view.params || {}).forEach(function(param) {
$scope.view.params[param] = Params.parse($scope.view.params[param], $scope);
});

// Replace tokens in title.
if ($scope.view.title) {
$scope.view.title = Token.replace($scope.view.title, $scope);
Expand Down Expand Up @@ -258,6 +263,11 @@ angular.module('choko')
url += '/' + $scope.view.itemKey;
}

// Add params to data if any.
Object.keys($scope.view.params || {}).forEach(function(param) {
$scope.data[param] = $scope.data[param] || $scope.view.params[param];
});

$http.post(url, $scope.data)
.success(function(data, status, headers, config) {
$scope.data = data;
Expand Down