Merge pull request #2413 from edx/bugfix/ichuang/do-not-import-tilde-files (e09990ff) · Commits · Hsin-Yu Chien / edx-platform-release · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

E

edx-platform-release
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

e09990ff

Commit e09990ff authored 11 years ago by David Baumgold

Downloads
- Plain Diff

Merge pull request #2413 from edx/bugfix/ichuang/do-not-import-tilde-files

Skip tilde files when importing

parents 50f7c0eb d1dc8c91

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

common/lib/xmodule/xmodule/modulestore/tests/test_xml.py 38 additions, 2 deletions

common/lib/xmodule/xmodule/modulestore/tests/test_xml.py
common/lib/xmodule/xmodule/modulestore/xml.py 6 additions, 2 deletions

common/lib/xmodule/xmodule/modulestore/xml.py
common/lib/xmodule/xmodule/modulestore/xml_importer.py 6 additions, 0 deletions

common/lib/xmodule/xmodule/modulestore/xml_importer.py
common/lib/xmodule/xmodule/tests/test_import_static.py 23 additions, 0 deletions

common/lib/xmodule/xmodule/tests/test_import_static.py
common/test/data/tilde/README.md 9 additions, 0 deletions

common/test/data/tilde/README.md
common/test/data/tilde/about/index.html 1 addition, 0 deletions

common/test/data/tilde/about/index.html
common/test/data/tilde/about/index.html~ 1 addition, 0 deletions

common/test/data/tilde/about/index.html~
common/test/data/tilde/course.xml 1 addition, 0 deletions

common/test/data/tilde/course.xml
common/test/data/tilde/course/2012_Fall.xml 2 additions, 0 deletions

common/test/data/tilde/course/2012_Fall.xml
common/test/data/tilde/static/example.txt 1 addition, 0 deletions

common/test/data/tilde/static/example.txt
common/test/data/tilde/static/example.txt~ 1 addition, 0 deletions

common/test/data/tilde/static/example.txt~

with 89 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment