Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
civitas-digitalis
platform
Commits
e9302ee1
Commit
e9302ee1
authored
Jan 17, 2018
by
Elias Englmeier
Browse files
small changes to accomodate sending of emails
parent
2789bde6
Changes
13
Hide whitespace changes
Inline
Side-by-side
modules/analysisService/analysisService-service/src/main/resources/service.properties
View file @
e9302ee1
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
ANALYSIS
build.number
=
7
6
build.date
=
151
5677473549
build.number
=
7
8
build.date
=
151
6194244914
build.auto.upgrade
=
true
\ No newline at end of file
modules/guestbook/guestbook-service/src/main/resources/service.properties
View file @
e9302ee1
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
GB
build.number
=
9
7
build.date
=
151
5677478102
build.number
=
9
9
build.date
=
151
6194249453
build.auto.upgrade
=
true
\ No newline at end of file
modules/ideaService/ideaService-api/src/main/java/ideaService/service/ReviewLocalService.java
View file @
e9302ee1
...
...
@@ -104,6 +104,9 @@ public interface ReviewLocalService extends BaseLocalService,
*/
public
Review
createReview
(
long
reviewId
);
public
Review
createReviewWithAutomatedDbId
(
boolean
accepted
,
java
.
lang
.
String
feedback
,
long
ideasIdRef
,
long
userId
);
/**
* Deletes the review from the database. Also notifies the appropriate model listeners.
*
...
...
@@ -262,9 +265,6 @@ public interface ReviewLocalService extends BaseLocalService,
long
companyId
,
int
start
,
int
end
,
OrderByComparator
<
Review
>
orderByComparator
);
public
long
createReviewWithAutomatedDbId
(
boolean
accepted
,
java
.
lang
.
String
feedback
,
long
ideasIdRef
,
long
userId
);
/**
* Returns the number of rows matching the dynamic query.
*
...
...
modules/ideaService/ideaService-api/src/main/java/ideaService/service/ReviewLocalServiceUtil.java
View file @
e9302ee1
...
...
@@ -94,6 +94,14 @@ public class ReviewLocalServiceUtil {
return
getService
().
createReview
(
reviewId
);
}
public
static
ideaService
.
model
.
Review
createReviewWithAutomatedDbId
(
boolean
accepted
,
java
.
lang
.
String
feedback
,
long
ideasIdRef
,
long
userId
)
{
return
getService
()
.
createReviewWithAutomatedDbId
(
accepted
,
feedback
,
ideasIdRef
,
userId
);
}
/**
* Deletes the review from the database. Also notifies the appropriate model listeners.
*
...
...
@@ -284,13 +292,6 @@ public class ReviewLocalServiceUtil {
orderByComparator
);
}
public
static
long
createReviewWithAutomatedDbId
(
boolean
accepted
,
java
.
lang
.
String
feedback
,
long
ideasIdRef
,
long
userId
)
{
return
getService
()
.
createReviewWithAutomatedDbId
(
accepted
,
feedback
,
ideasIdRef
,
userId
);
}
/**
* Returns the number of rows matching the dynamic query.
*
...
...
modules/ideaService/ideaService-api/src/main/java/ideaService/service/ReviewLocalServiceWrapper.java
View file @
e9302ee1
...
...
@@ -92,6 +92,14 @@ public class ReviewLocalServiceWrapper implements ReviewLocalService,
return
_reviewLocalService
.
createReview
(
reviewId
);
}
@Override
public
ideaService
.
model
.
Review
createReviewWithAutomatedDbId
(
boolean
accepted
,
java
.
lang
.
String
feedback
,
long
ideasIdRef
,
long
userId
)
{
return
_reviewLocalService
.
createReviewWithAutomatedDbId
(
accepted
,
feedback
,
ideasIdRef
,
userId
);
}
/**
* Deletes the review from the database. Also notifies the appropriate model listeners.
*
...
...
@@ -296,13 +304,6 @@ public class ReviewLocalServiceWrapper implements ReviewLocalService,
companyId
,
start
,
end
,
orderByComparator
);
}
@Override
public
long
createReviewWithAutomatedDbId
(
boolean
accepted
,
java
.
lang
.
String
feedback
,
long
ideasIdRef
,
long
userId
)
{
return
_reviewLocalService
.
createReviewWithAutomatedDbId
(
accepted
,
feedback
,
ideasIdRef
,
userId
);
}
/**
* Returns the number of rows matching the dynamic query.
*
...
...
modules/ideaService/ideaService-service/bin/META-INF/portlet-model-hints.xml
View file @
e9302ee1
...
...
@@ -94,7 +94,9 @@
<field
name=
"createDate"
type=
"Date"
/>
<field
name=
"modifiedDate"
type=
"Date"
/>
<field
name=
"accepted"
type=
"boolean"
/>
<field
name=
"feedback"
type=
"String"
/>
<field
name=
"feedback"
type=
"String"
>
<hint
name=
"max-length"
>
4000
</hint>
</field>
<field
name=
"ideasIdRef"
type=
"long"
/>
</model>
</model-hints>
\ No newline at end of file
modules/ideaService/ideaService-service/src/main/java/ideaService/model/impl/ReviewModelImpl.java
View file @
e9302ee1
...
...
@@ -101,7 +101,7 @@ public class ReviewModelImpl extends BaseModelImpl<Review>
TABLE_COLUMNS_MAP
.
put
(
"ideasIdRef"
,
Types
.
BIGINT
);
}
public
static
final
String
TABLE_SQL_CREATE
=
"create table IDEA_Review (uuid_ VARCHAR(75) null,reviewId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,accepted BOOLEAN,feedback
VARCHAR(75)
null,ideasIdRef LONG)"
;
public
static
final
String
TABLE_SQL_CREATE
=
"create table IDEA_Review (uuid_ VARCHAR(75) null,reviewId LONG not null primary key,groupId LONG,companyId LONG,userId LONG,userName VARCHAR(75) null,createDate DATE null,modifiedDate DATE null,accepted BOOLEAN,feedback
STRING
null,ideasIdRef LONG)"
;
public
static
final
String
TABLE_SQL_DROP
=
"drop table IDEA_Review"
;
public
static
final
String
ORDER_BY_JPQL
=
" ORDER BY review.reviewId ASC"
;
public
static
final
String
ORDER_BY_SQL
=
" ORDER BY IDEA_Review.reviewId ASC"
;
...
...
modules/ideaService/ideaService-service/src/main/java/ideaService/service/impl/ReviewLocalServiceImpl.java
View file @
e9302ee1
...
...
@@ -44,7 +44,7 @@ public class ReviewLocalServiceImpl extends ReviewLocalServiceBaseImpl {
* Never reference this class directly. Always use {@link ideaService.service.ReviewLocalServiceUtil} to access the review local service.
*/
public
long
createReviewWithAutomatedDbId
(
boolean
accepted
,
String
feedback
,
long
ideasIdRef
,
long
userId
){
public
Review
createReviewWithAutomatedDbId
(
boolean
accepted
,
String
feedback
,
long
ideasIdRef
,
long
userId
){
int
nextDbId
=
(
int
)
CounterLocalServiceUtil
.
increment
(
Review
.
class
.
getName
());
Review
review
=
ReviewLocalServiceUtil
.
createReview
(
nextDbId
);
review
.
setAccepted
(
accepted
);
...
...
@@ -57,7 +57,7 @@ public class ReviewLocalServiceImpl extends ReviewLocalServiceBaseImpl {
}
catch
(
PortalException
e
)
{
e
.
printStackTrace
();
}
return
review
.
getPrimaryKey
()
;
return
review
;
}
public
void
persistReviewAndPerformTypeChecks
(
Review
review
){
...
...
modules/ideaService/ideaService-service/src/main/resources/META-INF/portlet-model-hints.xml
View file @
e9302ee1
...
...
@@ -94,7 +94,9 @@
<field
name=
"createDate"
type=
"Date"
/>
<field
name=
"modifiedDate"
type=
"Date"
/>
<field
name=
"accepted"
type=
"boolean"
/>
<field
name=
"feedback"
type=
"String"
/>
<field
name=
"feedback"
type=
"String"
>
<hint
name=
"max-length"
>
4000
</hint>
</field>
<field
name=
"ideasIdRef"
type=
"long"
/>
</model>
</model-hints>
\ No newline at end of file
modules/ideaService/ideaService-service/src/main/resources/META-INF/sql/tables.sql
View file @
e9302ee1
...
...
@@ -72,6 +72,6 @@ create table IDEA_Review (
createDate
DATE
null
,
modifiedDate
DATE
null
,
accepted
BOOLEAN
,
feedback
VARCHAR
(
75
)
null
,
feedback
STRING
null
,
ideasIdRef
LONG
);
\ No newline at end of file
modules/ideaService/ideaService-service/src/main/resources/service.properties
View file @
e9302ee1
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
IDEA
build.number
=
23
0
build.date
=
151
567748278
0
build.number
=
23
2
build.date
=
151
619425436
0
build.auto.upgrade
=
true
\ No newline at end of file
modules/projectService/projectService-service/src/main/resources/service.properties
View file @
e9302ee1
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
PROJECT
build.number
=
14
2
build.date
=
151
5677485456
build.number
=
14
4
build.date
=
151
6194257074
build.auto.upgrade
=
true
\ No newline at end of file
modules/surveyAPI/surveyAPI-service/src/main/resources/service.properties
View file @
e9302ee1
...
...
@@ -13,6 +13,6 @@
##
build.namespace
=
SURVEY
build.number
=
24
1
build.date
=
151
5677490480
build.number
=
24
3
build.date
=
151
6194262123
build.auto.upgrade
=
true
\ No newline at end of file
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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