Skip to content

Develop -> hotfixes#2808

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.

Sign up for GitHub

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

Merged
rtibbles merged 9 commits into from
Jan 20, 2021
Merged

Develop -> hotfixes #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
53646a1
remove autofilled title value from contentNode
marcellamaki Dec 10, 2020
b86ce9d
use validation on completed, rather than defaulting to false
marcellamaki Jan 4, 2021
1937cd3
Add localhost to minio allowed origins
MisRob Jan 14, 2021
39f37c6
Merge pull request #2777 from MisRob/minio-cors-fix
rtibbles Jan 14, 2021
92b4aa9
Merge pull request #2675 from marcellamaki/remove-title-autofill-in-t…
rtibbles Jan 15, 2021
1172aca
Merge pull request #2809 from learningequality/hotfixes
jayoshih Jan 15, 2021
aa33ca2
Merge pull request #2833 from learningequality/hotfixes
rtibbles Jan 19, 2021
950e24f
Merge branch 'master' into 'develop'
rtibbles Jan 19, 2021
7d9b668
Merge pull request #2834 from rtibbles/master_into_develop
rtibbles Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions contentcuration/contentcuration/frontend/channelEdit/components/ContentNodeOptions.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,6 @@
let nodeData = {
parent: this.nodeId,
kind: 'topic',
title: this.$tr('topicDefaultTitle', { title: this.node.title }),
};
this.createContentNode(nodeData).then(newId => {
this.$router.push({
Expand DownExpand Up@@ -211,7 +210,6 @@
},

$trs: {
topicDefaultTitle: '{title} topic',
newSubtopic: 'New topic',
editTopicDetails: 'Edit topic details',
editDetails: 'Edit details',
Expand Down
5 changes: 5 additions & 0 deletions contentcuration/contentcuration/frontend/channelEdit/vuex/contentNode/actions.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -180,6 +180,11 @@ export function createContentNode(context, { parent, kind, ...payload }) {
...payload,
};

contentNodeData.complete = isNodeComplete({
nodeDetails: contentNodeData,
assessmentItems: [],
files: [],
});
return ContentNode.put(contentNodeData).then(id => {
context.commit('ADD_CONTENTNODE', {
id,
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@
"test-jest:debug": "node --inspect node_modules/.bin/jest --runInBand --watch",
"test-jest-cov": "jest --config jest_config/jest.conf.js --coverage",
"minio:test": "rm -rf ~/.minio_test && minio server ~/.minio_test/ || true",
"minio": "MINIO_API_CORS_ALLOW_ORIGIN='http://localhost:8080' MINIO_ACCESS_KEY=development MINIO_SECRET_KEY=development minio server ~/.minio_data/ || true",
"minio": "MINIO_API_CORS_ALLOW_ORIGIN='http://localhost:8080,http://127.0.0.1:8080' MINIO_ACCESS_KEY=development MINIO_SECRET_KEY=development minio server ~/.minio_data/ || true",
"runserver": "cd contentcuration && python manage.py runserver --settings=contentcuration.dev_settings 0.0.0.0:8080",
"runserver:debug-panel": "cd contentcuration && python manage.py runserver --settings=contentcuration.debug_panel_settings 0.0.0.0:8080",
"gunicornserver": "cd contentcuration && DJANGO_SETTINGS_MODULE=contentcuration.profile_settings gunicorn -b 0.0.0.0:8080 --workers=3 --threads=2 contentcuration.wsgi",
Expand Down