Skip to content
Snippets Groups Projects
Commit 077159f4 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge branch 'release-0.9.2'

parents 76a9b9af 5ce3f02e
Branches
Tags
No related merge requests found
......@@ -101,3 +101,7 @@
.Dash-card .Card {
overflow-y: scroll;
}
.Card--scalar {
margin-left: 1em;
}
......@@ -70,17 +70,17 @@ DashboardControllers.controller('DashDetail', ['$scope', '$routeParams', '$locat
}
};
var processResize = function(event, $element, item){
function processResize(event, $element, item){
$element.scope().$broadcast('cv-gridster-item-resized', $element);
savePosition();
};
}
var savePosition = function() {
function savePosition() {
Dashboard.reposition_cards({
'dashId': $scope.dashboard.id,
'cards': $scope.dashcards
});
};
}
$scope.toggleDashEditMode = function() {
......
......@@ -145,6 +145,7 @@ export default React.createClass({
if (value && value.length > 0) {
// value casting. we need the value in the filter to be of the proper type
if (this.state.fieldDef.base_type === "IntegerField" ||
this.state.fieldDef.base_type === "SmallIntegerField" ||
this.state.fieldDef.base_type === "BigIntegerField") {
value = parseInt(value);
} else if (this.state.fieldDef.base_type === "BooleanField") {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment