Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
C
CTF
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grzegorz
CTF
Commits
fa81f84c
Commit
fa81f84c
authored
Apr 04, 2016
by
Grzegorz Pietrusza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix tasks description
parent
ff3d7712
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
8 deletions
+9
-8
configuration.yml
service/configuration.yml
+0
-1
Task.java
...ava/com/telephoners/krakyournet/ctf/beans/tasks/Task.java
+3
-2
TextTask.java
...com/telephoners/krakyournet/ctf/beans/tasks/TextTask.java
+2
-2
WebTask.java
.../com/telephoners/krakyournet/ctf/beans/tasks/WebTask.java
+2
-2
TasksRepository.java
...phoners/krakyournet/ctf/repositories/TasksRepository.java
+2
-1
No files found.
service/configuration.yml
deleted
120000 → 0
View file @
ff3d7712
configuration.prod.yml
\ No newline at end of file
service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/Task.java
View file @
fa81f84c
package
com
.
telephoners
.
krakyournet
.
ctf
.
beans
.
tasks
;
import
com.fasterxml.jackson.annotation.JsonInclude
;
import
com.telephoners.krakyournet.ctf.beans.Flag
;
import
com.telephoners.krakyournet.ctf.beans.User
;
import
com.telephoners.krakyournet.ctf.helpers.PublicProperty
;
import
com.telephoners.krakyournet.ctf.beans.Flag
;
import
org.bson.types.ObjectId
;
import
org.mongodb.morphia.annotations.Entity
;
import
org.mongodb.morphia.annotations.Id
;
...
...
@@ -25,10 +25,11 @@ public abstract class Task
private
int
level
;
private
List
<
Flag
>
flags
;
public
Task
(
String
name
,
int
level
,
List
<
Flag
>
flags
)
public
Task
(
String
name
,
int
level
,
String
description
,
List
<
Flag
>
flags
)
{
this
.
name
=
name
;
this
.
level
=
level
;
this
.
description
=
description
;
this
.
flags
=
flags
;
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/TextTask.java
View file @
fa81f84c
...
...
@@ -13,9 +13,9 @@ public class TextTask extends Task
{
private
String
text
;
public
TextTask
(
String
name
,
int
level
,
List
<
Flag
>
flags
,
String
text
)
public
TextTask
(
String
name
,
int
level
,
String
description
,
List
<
Flag
>
flags
,
String
text
)
{
super
(
name
,
level
,
flags
);
super
(
name
,
level
,
description
,
flags
);
this
.
text
=
text
;
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/beans/tasks/WebTask.java
View file @
fa81f84c
...
...
@@ -23,9 +23,9 @@ public class WebTask extends Task
private
String
url
;
private
static
final
Joiner
URL_JOINER
=
Joiner
.
on
(
"/"
);
public
WebTask
(
String
name
,
int
level
,
List
<
Flag
>
flags
,
String
url
)
public
WebTask
(
String
name
,
int
level
,
String
description
,
List
<
Flag
>
flags
,
String
url
)
{
super
(
name
,
level
,
flags
);
super
(
name
,
level
,
description
,
flags
);
this
.
url
=
url
;
}
...
...
service/src/main/java/com/telephoners/krakyournet/ctf/repositories/TasksRepository.java
View file @
fa81f84c
...
...
@@ -33,9 +33,10 @@ public class TasksRepository extends Repository<Task>
public
List
<
Task
>
getAllPublic
()
{
return
datastore
.
createQuery
(
Task
.
class
)
List
<
Task
>
level
=
datastore
.
createQuery
(
Task
.
class
)
.
order
(
"level"
)
.
retrievedFields
(
true
,
DBObjectUtils
.
getPublicFields
(
Task
.
class
))
.
asList
();
return
level
;
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment