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

Fix handling of library versions in the library tools.

Browse Source
This commit is contained in:
Jonathan Piacenti
2015-04-02 18:21:23 +00:00
parent 51905f0cd5
commit ce19c769eb
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/lib/xmodule/xmodule/library_tools.py
View File

@@ -16,7 +16,7 @@ class LibraryToolsService(object):
def __init__(self, modulestore):
self.store = modulestore
def _get_library(self, library_key, version=None):
def _get_library(self, library_key):
"""
Given a library key like "library-v1:ProblemX+PR0B", return the
'library' XBlock with meta-information about the library.
@@ -28,9 +28,6 @@ class LibraryToolsService(object):
if not isinstance(library_key, LibraryLocator):
library_key = LibraryLocator.from_string(library_key)
if version:
library_key.for_version(version)
try:
return self.store.get_library(library_key, remove_version=False, remove_branch=False)
except ItemNotFoundError:
@@ -126,8 +123,8 @@ class LibraryToolsService(object):
return
source_blocks = []
library_key = dest_block.source_library_key
library = self._get_library(library_key, version=version)
library_key = dest_block.source_library_key.for_version(version)
library = self._get_library(library_key)
if library is None:
raise ValueError("Requested library not found.")
if user_perms and not user_perms.can_read(library_key):