From c36370ae83d4905ec2ec54a6c89b5ab7e6337682 Mon Sep 17 00:00:00 2001 From: Keith Woodlock Date: Fri, 23 Nov 2012 17:37:23 +0000 Subject: [PATCH] update patch --- .../patch-0018-add-maker-checker-flag-to-permissions.sql | 4 ++-- .../java/org/mifosng/platform/user/domain/Permission.java | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/mifosng-db/patches/patch-0018-add-maker-checker-flag-to-permissions.sql b/mifosng-db/patches/patch-0018-add-maker-checker-flag-to-permissions.sql index 27499419f..b9ac3f2e3 100644 --- a/mifosng-db/patches/patch-0018-add-maker-checker-flag-to-permissions.sql +++ b/mifosng-db/patches/patch-0018-add-maker-checker-flag-to-permissions.sql @@ -1,8 +1,8 @@ -ALTER TABLE m_permission +ALTER TABLE `m_permission` DROP COLUMN `default_name` , DROP COLUMN `default_description` , - ADD COLUMN `is_maker_checker` TINYINT(1) NULL DEFAULT AFTER `action_name` ; + ADD COLUMN `is_maker_checker` TINYINT(1) NOT NULL AFTER `action_name` ; update m_permission set is_maker_checker = false; diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java index f8b85ad31..4a1d3a068 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/user/domain/Permission.java @@ -24,12 +24,11 @@ public class Permission extends AbstractPersistable { @SuppressWarnings("unused") @Column(name = "action_name", nullable = true, length = 100) private final String actionName; - + @SuppressWarnings("unused") @Column(name = "is_maker_checker", nullable = false) - private Boolean isMakerChecker; - - + private Boolean isMakerChecker; + protected Permission() { this.grouping = null; this.code = null; @@ -44,5 +43,4 @@ public class Permission extends AbstractPersistable { public String code() { return this.code; } - } \ No newline at end of file