-
Notifications
You must be signed in to change notification settings - Fork 578
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
1307 content scheduling improvements #1349
1307 content scheduling improvements #1349
Conversation
I made it so it is opt-in instead of default to have the column: class ScheduledContentController extends BaseModuleController
{
protected $moduleName = 'scheduledContents';
protected $indexOptions = [
'includeScheduledInList' => true,
]; |
This should be ready now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @haringsrob! Is the publish-on
key used anywhere I missed?
@ifox looks like it is not :D I will remove it |
@ifox how do you usually deal with lang.csv merge conflicts? 😅 |
I would rebase the branch ignoring it and then regen the CSV before force pushing. |
regen the CSV -> the command can only convert to the files from the csv or am I missing something? |
There's a |
a3d1936
to
c90a3f3
Compare
@ifox great will try that next time. Did it manual for now so should be fine now |
frontend/js/store/modules/config.js
Outdated
@@ -0,0 +1,17 @@ | |||
const state = { | |||
publishDate24Hr: window[process.env.VUE_APP_NAME].STORE.config.publishDate24Hr, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't look like this isn't being used in Vue components, so we should be able to remove it.
views/layouts/main.blade.php
Outdated
@@ -82,6 +82,10 @@ | |||
window['{{ config('twill.js_namespace') }}'].twillLocalization = {!! json_encode($twillLocalization) !!}; | |||
window['{{ config('twill.js_namespace') }}'].STORE = {}; | |||
window['{{ config('twill.js_namespace') }}'].STORE.form = {}; | |||
window['{{ config('twill.js_namespace') }}'].STORE.config = { | |||
publishDate24Hr: {{config('twill.publish_date_24h') ? 'true' : 'false'}}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't look like this isn't being used in Vue components, so we should be able to remove it.
Hey @ifox conflict was resolved. |
Description
In this pr:
There are some questions I left in code and also wondering if this is generally the correct approach.
@ifox could you have a look?
Related Issues
Fixes #1307