archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Some minor fixes.

Browse Source
This commit is contained in:
robin shine 2013-09-29 20:56:18 +08:00
parent f565e11908
commit 3a1b1d9a15
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gitop.core/src/main/java/com/pmease/gitop/core/model/User.java
View File

@ -24,16 +24,6 @@ import com.pmease.gitop.core.permission.object.ProtectedObject;
import com.pmease.gitop.core.permission.object.UserBelonging; import com.pmease.gitop.core.permission.object.UserBelonging;
import com.pmease.gitop.core.permission.operation.GeneralOperation; import com.pmease.gitop.core.permission.operation.GeneralOperation;
/**
* This class represents either a project or an user in the system.
* <p>
* In Gitop, users and projects are the same thing.
* If necessary, you can always treat an user account as a project account.
* {@link Project} and {@link Team} are always created under a specific account.
*
* @author robin
*
*/
@SuppressWarnings("serial") @SuppressWarnings("serial")
@Entity @Entity
@Editable @Editable
@ -49,10 +39,8 @@ public class User extends AbstractUser implements ProtectedObject {
@Column(nullable=false) @Column(nullable=false)
private String email; private String email;
@Column
private String displayName; private String displayName;
@Column
private String avatarUrl; private String avatarUrl;
private boolean admin; private boolean admin;
@ -217,13 +205,6 @@ public class User extends AbstractUser implements ProtectedObject {
} }
} }
public static User anonymous() {
User user = new User();
user.setId(0L);
user.setName("Guest");
return user;
}
@Override @Override
public boolean implies(Permission permission) { public boolean implies(Permission permission) {
// Administrator can do anything // Administrator can do anything

2
gitop.core/src/main/java/com/pmease/gitop/core/permission/UserRealm.java
View File

@ -30,7 +30,7 @@ public class UserRealm extends AbstractRealm {
if (userId != 0L) { if (userId != 0L) {
return userManager.load(userId); return userManager.load(userId);
} else { } else {
return User.anonymous(); return User.ANONYMOUS;
} }
} }

2
gitop.web/src/main/java/com/pmease/gitop/web/resource/TestResource.java
View File

@ -28,7 +28,9 @@ import com.pmease.gitop.web.SitePaths;
@Path("/file") @Path("/file")
public class TestResource { public class TestResource {
@SuppressWarnings("unused")
private static final String SUCCESS_RESPONSE = "Successful"; private static final String SUCCESS_RESPONSE = "Successful";
@SuppressWarnings("unused")
private static final String FAILED_RESPONSE = "Failed"; private static final String FAILED_RESPONSE = "Failed";
@POST @POST