From 87ddb163c2baa8b37009aad55f52590d8ae4763f Mon Sep 17 00:00:00 2001 From: Martin Geno Date: Wed, 16 Nov 2016 02:03:29 +0100 Subject: [PATCH] add int without nullint of golang sql --- public/app/host/mail.jade | 2 +- public/app/web/webmenu.js | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/public/app/host/mail.jade b/public/app/host/mail.jade index 0d03006..3fc22b7 100644 --- a/public/app/host/mail.jade +++ b/public/app/host/mail.jade @@ -36,7 +36,7 @@ span.glyphicon.glyphicon-floppy-disk | Save td(data-title="'Postfach'") - span(ng-repeat="i in loginlist",ng-if="i.ID == item.login.Int64") {{i.username}} + span(ng-repeat="i in loginlist",ng-if="i.ID == item.login") {{i.username}} td(data-title="'Option'") .btn-group.btn-group-xs span.btn.btn-default(ng-click="item.isEditing = true",ng-if="!item.isEditing") diff --git a/public/app/web/webmenu.js b/public/app/web/webmenu.js index 4e035d5..de34eff 100644 --- a/public/app/web/webmenu.js +++ b/public/app/web/webmenu.js @@ -16,12 +16,9 @@ angular.module('warehost') $scope.obj = e.source.nodeScope.$modelValue; $scope.obj.position = e.dest.index; if(e.dest.nodesScope.$nodeScope){ - $scope.obj.parentid = { - Int64: e.dest.nodesScope.$nodeScope.$modelValue.ID, - Valid: true - }; + $scope.obj.parentid = e.dest.nodesScope.$nodeScope.$modelValue.ID; }else{ - $scope.obj.parentid = {Int64: 0, Valid: false}; + $scope.obj.parentid = null; } $http.patch(config.api+'/web/website/'+$stateParams.websiteid+'/menu/'+$scope.obj.ID,$scope.obj).then(submitresult); } @@ -59,10 +56,7 @@ angular.module('warehost') $scope.add = function(a){ $scope.obj = {}; if(a){ - $scope.obj.parentid = { - Int64: a.$modelValue.ID, - Valid: true - }; + $scope.obj.parentid = a.$modelValue.ID; $scope.parent = a.$modelValue; }else{ $scope.parent = null;