Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Riina Antikainen
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 033e23cc
authored
Mar 02, 2014
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'hurr' into 'master'
Random minor changes Mostly api related stuff.
2 parents
78dcf6db
baa3067f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
2 deletions
code/MoyaDatabase/src/fi/codecrew/moya/model/EventUser.java
code/MoyaUtilities/src/main/java/fi/codecrew/moya/utilities/SearchQuery.java
code/MoyaWeb/src/fi/codecrew/moya/rest/RestApplicationEntrypoint.java
code/MoyaDatabase/src/fi/codecrew/moya/model/EventUser.java
View file @
033e23c
...
...
@@ -177,6 +177,14 @@ public class EventUser extends GenericEntity {
this
.
notes
=
notes
;
}
/**
* NOTICE: This returns only manually added roles. If you want to get all
* roles from products, places, etc, use
* {@link fi.codecrew.moya.beans.UserBeanLocal#findUsersRoles(EventUser)
* UserBeanLocal#findUsersRoles(EventUser) }
*
* @return
*/
public
List
<
Role
>
getRoles
()
{
return
roles
;
}
...
...
code/MoyaUtilities/src/main/java/fi/codecrew/moya/utilities/SearchQuery.java
View file @
033e23c
...
...
@@ -4,7 +4,7 @@ import java.io.Serializable;
public
class
SearchQuery
implements
Serializable
{
public
enum
QuerySortOrder
{
public
static
enum
QuerySortOrder
{
UNSORTED
,
ASCENDING
,
DESCENDING
}
...
...
code/MoyaWeb/src/fi/codecrew/moya/rest/RestApplicationEntrypoint.java
View file @
033e23c
...
...
@@ -3,7 +3,9 @@ package fi.codecrew.moya.rest;
import
javax.ws.rs.ApplicationPath
;
import
javax.ws.rs.core.Application
;
@ApplicationPath
(
"/rest"
)
@ApplicationPath
(
RestApplicationEntrypoint
.
REST_PATH
)
public
class
RestApplicationEntrypoint
extends
Application
{
public
static
final
String
REST_PATH
=
"/rest"
;
}
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment