Skip to content

Make the modelEdit accepts alphanumeric for findById defaults #301

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
jmaicaaan wants to merge 2 commits into
base: dd
Choose a base branch
from
Open

Make the modelEdit accepts alphanumeric for findById defaults #301

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cc0dda
Make the modelEdit accepts alphanumeric
jsantos-isbx Mar 9, 2018
477b4f7
Removed dist
jsantos-isbx Mar 13, 2018
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
9 changes: 7 additions & 2 deletions client/app/dashboard/model/edit/ModelEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,13 @@ angular.module('dashboard.Dashboard.Model.Edit', [

//Check to see if editing model
var id = null;
if ($stateParams.id && $stateParams.id > 0) id = $stateParams.id;
if ($scope.action.options.id && $scope.action.options.id > 0) id = $scope.action.options.id;
if ($stateParams.id && $scope.action.options && $scope.action.options.allowAlphaNumericSearch) {
// allow alpha numeric search - some endpoints findById doesn't accept id (number)
id = $stateParams.id;
} else {
if ($stateParams.id && $stateParams.id > 0) id = $stateParams.id;
if ($scope.action.options.id && $scope.action.options.id > 0) id = $scope.action.options.id;
}
if (id) {
$scope.isEdit = true;
$scope.modelDisplay = null; //reset model display to prevent caching
Expand Down