Compare commits
No commits in common. "910df3d2677faf5e6cc85b43e79f6f8847b3df15" and "878d61de2ef6b06f9088c4382308ec755f73fe0d" have entirely different histories.
910df3d267
...
878d61de2e
|
@ -15,9 +15,8 @@ Awarding associating a decoration to a user
|
||||||
|
|
||||||
|
|
||||||
# AwardingPopulated (Awarding)
|
# AwardingPopulated (Awarding)
|
||||||
Awarding with populated decoration, proposer and army-user
|
Awarding with populated decoration and proposer
|
||||||
|
|
||||||
## Properties
|
## Properties
|
||||||
+ proposer (Proposer, required) - app user who requested this awarding
|
+ proposer (Proposer, required) - app user who requested this awarding
|
||||||
+ decorationId (Decoration, required) - populated decoration object that is given with the awarding
|
+ decorationId (Decoration, required) - populated decoration object that is given with the awarding
|
||||||
+ userId (User, required) - populated user who gets this awarding
|
|
||||||
|
|
|
@ -33,7 +33,7 @@ awarding.route('/')
|
||||||
filter.confirmed = 0;
|
filter.confirmed = 0;
|
||||||
}
|
}
|
||||||
AwardingModel.find(filter, {}, {sort: {date: 'desc'}})
|
AwardingModel.find(filter, {}, {sort: {date: 'desc'}})
|
||||||
.populate('decorationId').populate('proposer', resultSet).populate('userId')
|
.populate('decorationId').populate('proposer', resultSet)
|
||||||
.exec((err, items) => {
|
.exec((err, items) => {
|
||||||
if (err) {
|
if (err) {
|
||||||
err.status = codes.servererror;
|
err.status = codes.servererror;
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
tbody {
|
tbody {
|
||||||
background: rgba(255, 255, 255, 0.88);
|
background: #ffffffe0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cell-outline {
|
.cell-outline {
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
.middle-row {
|
.middle-row {
|
||||||
min-height: 120px;
|
min-height: 120px;
|
||||||
border: rgb(34, 34, 34);
|
border: rgb(34, 34, 34);
|
||||||
background-color: rgba(255, 255, 255, 0.88);
|
background-color: #ffffffe0;
|
||||||
border-left-style: solid;
|
border-left-style: solid;
|
||||||
border-right-style: solid;
|
border-right-style: solid;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue