Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Codecrew
/
Moya
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
30
Merge Requests
2
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 1d11e26a
authored
Jan 30, 2015
by
Tuukka Kivilahti
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'placefetch' into 'master'
Logging for place s See merge request
!243
2 parents
cb29725f
c4974a16
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
1 deletions
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
code/moya-database/src/main/java/fi/codecrew/moya/model/GroupMembership.java
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/moyamessage/MoyaEventType.java
code/moya-beans/ejbModule/fi/codecrew/moya/beans/PlaceGroupBean.java
View file @
1d11e26
...
...
@@ -305,15 +305,25 @@ public class PlaceGroupBean implements PlaceGroupBeanLocal {
@Override
public
GroupMembership
markGroupMembershipEntered
(
GroupMembership
membership
)
{
membership
.
setEnteredEvent
(
Calendar
.
getInstance
());
membership
.
setEnteredEventAdmin
(
permbean
.
getCurrentUser
());
loggerbean
.
sendMessage
(
MoyaEventType
.
PLACE_ACTION
,
(
membership
.
getUser
()
!=
null
?
membership
.
getUser
()
:
membership
.
getPlaceGroup
().
getCreator
()),
"Place given as entered event"
);
membership
=
gmemfacade
.
merge
(
membership
);
return
membership
;
}
@Override
public
GroupMembership
markGroupMembershipNotEntered
(
GroupMembership
membership
)
{
membership
.
setEnteredEvent
(
null
);
membership
.
setEnteredEventAdmin
(
null
);
loggerbean
.
sendMessage
(
MoyaEventType
.
PLACE_ACTION
,
(
membership
.
getUser
()
!=
null
?
membership
.
getUser
()
:
membership
.
getPlaceGroup
().
getCreator
()),
"Place ungiven"
);
membership
=
gmemfacade
.
merge
(
membership
);
return
membership
;
}
}
code/moya-database/src/main/java/fi/codecrew/moya/model/GroupMembership.java
View file @
1d11e26
...
...
@@ -177,4 +177,12 @@ public class GroupMembership extends GenericEntity {
return
inviteToken
;
}
public
EventUser
getEnteredEventAdmin
()
{
return
enteredEventAdmin
;
}
public
void
setEnteredEventAdmin
(
EventUser
enteredEventAdmin
)
{
this
.
enteredEventAdmin
=
enteredEventAdmin
;
}
}
code/moya-utils/src/main/java/fi/codecrew/moya/utilities/moyamessage/MoyaEventType.java
View file @
1d11e26
...
...
@@ -14,6 +14,7 @@ public enum MoyaEventType {
INVITE_ACCEPTED
(
MoyaEventSource
.
USER
),
USER_PERMISSION_VIOLATION
(
MoyaEventSource
.
USER
),
LOGIN_SUCCESSFULL
(
MoyaEventSource
.
USER
),
PLACE_ACTION
(
MoyaEventSource
.
PLACEMAP
),
;
...
...
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