Skip to content

Commit 928ce91

Browse files
authored
Merge pull request #89 from Ahmad-AbuOsbeh/master
fixed expiration date limit to 1 day
2 parents 1d26cfd + 7952435 commit 928ce91

3 files changed

Lines changed: 53 additions & 40 deletions

File tree

control/content/assets/css/bf_base.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,7 @@ color: var(--c-info);
664664
background-color: var(--c-white);
665665
padding-top: .75rem;
666666
box-shadow: 0 -.125rem .5rem rgba(0,0,0,.1);
667+
z-index: 2;
667668
}
668669
.bottom-actions button,
669670
.bottom-actions .btn{

control/content/controllers/content.item.controller.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
function isValidItem(item) {
184184
if (item) {
185185
if (item.startOn && item.expiresOn) {
186-
if (item.expiresOn - item.startOn > 0) return item.title && true;
186+
if (item.expiresOn - item.startOn >= 0) return item.title && true;
187187
else return false;
188188
} else return item.title;
189189
} else {
@@ -198,7 +198,7 @@
198198
ContentItem.item.data.expiresOn
199199
) {
200200
if (
201-
ContentItem.item.data.expiresOn - ContentItem.item.data.startOn >
201+
ContentItem.item.data.expiresOn - ContentItem.item.data.startOn >=
202202
0
203203
)
204204
return ContentItem.item.data.title && true;

package-lock.json

Lines changed: 50 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)