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 734c9129
authored
Sep 17, 2013
by
Antti Tonkyra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tuning, logic fix
1 parent
298fc0db
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/TournamentBean.java
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentGame.java
code/MoyaUtilities/src/main/java/fi/codecrew/moya/enums/apps/MapPermission.java
code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/TournamentBean.java
View file @
734c912
...
...
@@ -141,7 +141,7 @@ public class TournamentBean implements TournamentBeanLocal {
if
(
capt
!=
null
)
{
// Assert team has the correct number of players for a match
if
(
tournamentParticipant
.
getTeamMembers
().
size
()
>=
tournamentParticipant
.
getTournament
().
getPlayersPer
Team
())
{
if
(
tournamentParticipant
.
getTeamMembers
().
size
()
>=
tournamentParticipant
.
getTournament
().
getPlayersPer
Match
())
{
tournamentParticipant
=
tournamentParticipantFacade
.
create
(
tournamentParticipant
);
t
.
getParticipants
().
add
(
tournamentParticipant
);
}
else
{
...
...
code/MoyaDatabase/src/fi/codecrew/moya/model/TournamentGame.java
View file @
734c912
...
...
@@ -39,7 +39,7 @@ public class TournamentGame extends GenericEntity implements Serializable {
@JoinColumn
(
name
=
"event_id"
,
nullable
=
false
)
private
LanEvent
lanEvent
;
@OneToMany
@OneToMany
(
mappedBy
=
"tournamentGame"
)
private
List
<
TournamentRule
>
availableRules
;
public
TournamentGame
()
{
super
();
}
...
...
code/MoyaUtilities/src/main/java/fi/codecrew/moya/enums/apps/MapPermission.java
View file @
734c912
...
...
@@ -12,7 +12,7 @@ public enum MapPermission implements IAppPermission {
;
public
static
final
String
S_MANAGE_OTHERS
=
"MAP/MANAGE_OTHERS"
;
//
public static final String S_BUY_PLACES = "MAP/BUY_PLACES";
public
static
final
String
S_BUY_PLACES
=
"MAP/BUY_PLACES"
;
public
static
final
String
S_VIEW
=
"MAP/VIEW"
;
public
static
final
String
S_MANAGE_MAPS
=
"MAP/MANAGE_MAPS"
;
public
static
final
String
S_RELEASE_PLACE
=
"MAP/RELEASE_PLACE"
;
...
...
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