Merge pull request #286 from jayoshih/production

Updated email to noreply, catch gaierrors if pypi goes down
learningequality · May 12, 2017 · c2b04b7 · c2b04b7
2 parents 3354f96 + 3bfbe20
commit c2b04b7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/contentcuration/contentcuration/ricecooker_versions.py b/contentcuration/contentcuration/ricecooker_versions.py
@@ -1,8 +1,14 @@
 import xmlrpclib
+from socket import gaierror
 
-pypi = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
+VERSION_OK = "0.5.6"
+
+try:
+	pypi = xmlrpclib.ServerProxy('https://pypi.python.org/pypi')
+	VERSION_OK = pypi.package_releases('ricecooker')[0]
+except gaierror:
+	pass
 
-VERSION_OK = pypi.package_releases('ricecooker')[0]
 VERSION_OK_MESSAGE = "Ricecooker v{} is up-to-date."
 VERSION_SOFT_WARNING = "0.5.6"
 VERSION_SOFT_WARNING_MESSAGE = "You are using Ricecooker v{}, however v{} is available. You should consider upgrading your Ricecooker."

diff --git a/contentcuration/contentcuration/settings.py b/contentcuration/contentcuration/settings.py
@@ -208,7 +208,7 @@
 # MAILGUN_ACCESS_KEY = 'ACCESS-KEY'
 # MAILGUN_SERVER_NAME = 'SERVER-NAME'
 
-DEFAULT_FROM_EMAIL = 'Kolibri Content Curation <info@learningequality.org>'
+DEFAULT_FROM_EMAIL = 'Kolibri Content Workshop (Do Not Reply) <noreply@learningequality.org>'
 DEFAULT_LICENSE = 1
 
 SERVER_EMAIL = 'curation-errors@learningequality.org'

diff --git a/...uration/contentcuration/static/js/edit_channel/move/hbtemplates/move_list_item.handlebars b/...uration/contentcuration/static/js/edit_channel/move/hbtemplates/move_list_item.handlebars
@@ -1,4 +1,4 @@
-<div class="{{#if is_disabled}}disabled{{/if}}" {{#if is_disabled}}title="Cannot move to selected topics"{{/if}}>
+<div class="move_item_wrapper {{#if is_disabled}}disabled{{/if}}" {{#if is_disabled}}title="Cannot move to selected topics"{{/if}}>
 	{{#if is_target}}<input type="radio" id="move_item_{{node.id}}_check" class="move_checkbox" name="target_radio_list" {{#if is_disabled}}disabled{{/if}}></input>{{/if}}
 	<label for="move_item_{{node.id}}_check" class="move_item {{#if is_target}}dblclick_toggle{{else}}{{#if node.children}}tog_folder{{/if}}{{/if}}" {{#unless is_disabled}}title="{{node.title}}"{{/unless}}>
 		{{#if has_descendants}}

diff --git a/contentcuration/contentcuration/static/js/edit_channel/move/views.js b/contentcuration/contentcuration/static/js/edit_channel/move/views.js
@@ -167,7 +167,7 @@ var MoveItem = BaseViews.BaseListNodeItemView.extend({
     events: {
         'dblclick .dblclick_toggle' : 'toggle',
         'click .tog_folder' : 'toggle',
-        'change >.move_checkbox' : 'handle_checked'
+        'change >.move_item_wrapper .move_checkbox' : 'handle_checked'
     },
     render: function() {
         var has_descendants = this.model.get('metadata').resource_count < this.model.get('metadata').total_count;

diff --git a/contentcuration/contentcuration/view/internal_views.py b/contentcuration/contentcuration/view/internal_views.py
@@ -305,7 +305,7 @@ def map_files_to_node(node, data):
         if file_data.get('language'):
             language = Language.objects.get(pk=file_data['language'])
 
-        file_path=generate_storage_url(file_data['filename'])
+        file_path=generate_file_on_disk_name(file_data['filename'])
         if not os.path.isfile(file_path):
             raise IOError('{} not found'.format(file_path))
 
@@ -326,7 +326,7 @@ def map_files_to_assessment_item(question, data):
     """ Generate files that reference the content node's assessment items """
     for file_data in data:
         file_hash = file_data['filename'].split(".")
-        file_path = generate_storage_url(file_data['filename'])
+        file_path = generate_file_on_disk_name(file_data['filename'])
         if not os.path.isfile(file_path):
             raise IOError('{} not found'.format(file_path))