Revision 623:66f69a7348ed src/gr/ebs/gss/server/domain/User.java

b/src/gr/ebs/gss/server/domain/User.java
188 188
	private Date nonceExpiryDate;
189 189

  
190 190
	/**
191
	 * Flag that denotes whether the user has accepted the
192
	 * terms and conditions of the service.
193
	 * XXX: the columnDefinition is postgres specific, if deployment database is changed this shall be changed too
191
	 * Flag that denotes whether the user has accepted the terms and
192
	 * conditions of the service.
193
	 * XXX: the columnDefinition is postgres specific, if deployment
194
	 * database is changed this shall be changed too
194 195
	 */
195 196
	@Column(columnDefinition=" boolean DEFAULT false")
196 197
	private boolean acceptedPolicy;
197 198

  
198 199
	/**
200
	 * A flag that denotes whether the user is active or not. Users may be
201
	 * administratively forbidden to use the service by setting this flag to
202
	 * false.
203
	 */
204
	@Column(columnDefinition=" boolean DEFAULT true")
205
	private boolean active;
206

  
207
	/**
199 208
	 * Password for WebDAV
200 209
	 */
201 210
	private String webDAVPassword;
......
379 388
	public String getUsername() {
380 389
		return username;
381 390
	}
391

  
382 392
	/**
383 393
	 * Modify the username.
384 394
	 *
......
494 504
		u.setFirstname(firstname);
495 505
		u.setEmail(email);
496 506
		u.setUsername(username);
507
		u.setActive(active);
508
		if(userClass!= null)
509
			u.setUserClass(userClass.getDTOWithoutUsers());
510
		u.setLastLoginDate(lastLogin);
497 511
		return u;
498 512
	}
499 513

  
......
622 636
		nonceExpiryDate = aNonceExpiryDate;
623 637
	}
624 638

  
639
	public boolean isActive() {
640
		return active;
641
	}
642

  
643
	public void setActive(boolean isActive) {
644
		active = isActive;
645
	}
646

  
625 647
	@Override
626 648
	public boolean equals(Object o) {
627 649
		if (this == o) return true;

Also available in: Unified diff