From d0cb11fcb8aa56081291f40746ec1c85844ed6a5 Mon Sep 17 00:00:00 2001
From: Roberto Sánchez <roberto.sanchez@curisit.net>
Date: Thu, 26 Dec 2013 16:44:48 +0000
Subject: [PATCH] #333 feature - Fixed some JPA config issues
---
securis/src/main/java/net/curisit/securis/db/User.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/db/User.java b/securis/src/main/java/net/curisit/securis/db/User.java
index e96102e..ba5890f 100644
--- a/securis/src/main/java/net/curisit/securis/db/User.java
+++ b/securis/src/main/java/net/curisit/securis/db/User.java
@@ -35,12 +35,13 @@
@Id
private String username;
+
private String password;
@JsonProperty(value = "short_name")
@Column(name = "short_name")
private String shortName;
- private int role;
+ private int roles;
@JsonProperty(value = "full_name")
@Column(name = "full_name")
@@ -61,7 +62,7 @@
@ManyToMany
@JoinTable(name = "user_organization", //
joinColumns =
- { @JoinColumn(name = "user_id", referencedColumnName = "id") }, //
+ { @JoinColumn(name = "user_id", referencedColumnName = "username") }, //
inverseJoinColumns =
{ @JoinColumn(name = "organization_id", referencedColumnName = "id") } //
)
@@ -83,12 +84,12 @@
this.password = password;
}
- public int getRole() {
- return role;
+ public int getRoles() {
+ return roles;
}
- public void setRole(int role) {
- this.role = role;
+ public void setRoles(int roles) {
+ this.roles = roles;
}
public String getFullName() {
--
Gitblit v1.3.2