Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5107 from edx/adam/resolve-merge-conflicts

Browse Source 
Adam/resolve merge conflicts
This commit is contained in:
Adam
2014-09-05 14:55:24 -04:00
parent 3f8ea64d33 0bd9bc628c
commit 58e6dcf79c
10 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/djangoapps/courseware/model_data.py
View File

@@ -110,7 +110,8 @@ class FieldDataCache(object):
return descriptors
with modulestore().bulk_operations(descriptor.location.course_key):
# FIXME
with modulestore().bulk_temp_noop_operations(descriptor.location.course_key):
descriptors = get_child_descriptors(descriptor, depth, descriptor_filter)
return FieldDataCache(descriptors, course_id, user, select_for_update)

4
lms/djangoapps/courseware/tests/test_module_render.py
View File

@@ -335,7 +335,7 @@ class TestTOC(ModuleStoreTestCase):
# TODO: LMS-11220: Document why split find count is 9
# TODO: LMS-11220: Document why mongo find count is 4
@ddt.data((ModuleStoreEnum.Type.mongo, 4, 0), (ModuleStoreEnum.Type.split, 9, 0))
@ddt.data((ModuleStoreEnum.Type.mongo, 3, 0), (ModuleStoreEnum.Type.split, 21, 0))
@ddt.unpack
def test_toc_toy_from_chapter(self, default_ms, num_finds, num_sends):
with self.store.default_store(default_ms):
@@ -364,7 +364,7 @@ class TestTOC(ModuleStoreTestCase):
# TODO: LMS-11220: Document why split find count is 9
# TODO: LMS-11220: Document why mongo find count is 4
@ddt.data((ModuleStoreEnum.Type.mongo, 4, 0), (ModuleStoreEnum.Type.split, 9, 0))
@ddt.data((ModuleStoreEnum.Type.mongo, 3, 0), (ModuleStoreEnum.Type.split, 21, 0))
@ddt.unpack
def test_toc_toy_from_section(self, default_ms, num_finds, num_sends):
with self.store.default_store(default_ms):

2
lms/templates/instructor/instructor_dashboard_2/e-commerce.html
View File

@@ -99,7 +99,6 @@
<tr class="coupons-headings">
<th class="c_code">${_("Code")}</th>
<th class="c_dsc">${_("Description")}</th>
<th class="c_course_id">${_("Course_id")}</th>
<th class="c_discount">${_("Discount (%)")}</th>
<th class="c_count">${_("Count")}</th>
<th class="c_action">${_("Actions")}</th>
@@ -114,7 +113,6 @@
%endif
<td>${coupon.code}</td>
<td>${coupon.description}</td>
<td>${coupon.course_id.to_deprecated_string()}</td>
<td>${coupon.percentage_discount}</td>
<td>
${ coupon.couponredemption_set.all().count() }

3
lms/templates/shoppingcart/receipt.html
View File

@@ -1,6 +1,7 @@
<%! from django.utils.translation import ugettext as _ %>
<%! from django.core.urlresolvers import reverse %>
<%! from django.conf import settings %>
<%! from microsite_configuration import microsite %>
<%inherit file="../main.html" />
@@ -22,7 +23,7 @@
<section class="wrapper cart-list">
<div class="wrapper-content-main">
<article class="content-main">
<h1>${_(settings.PLATFORM_NAME + " (" + settings.SITE_NAME + ")" + " Electronic Receipt")}</h1>
<h1>${_("{platform_name} ({site_name}) Electronic Receipt").format(platform_name=microsite.get_value('platform_name', settings.PLATFORM_NAME), site_name=microsite.get_value('SITE_NAME', settings.SITE_NAME))}</h1>
<hr />
<table class="order-receipt">