# HG changeset patch # User cavaliet # Date 1406130604 -7200 # Node ID ae211f69b15961f402774035739a06bd239de4fc # Parent 6c7a7cd62492917ff0ea44c1af906954d02b4948 v1.53.9 corrections diff -r 6c7a7cd62492 -r ae211f69b159 src/ldt/ldt/__init__.py --- a/src/ldt/ldt/__init__.py Wed Jul 23 17:40:18 2014 +0200 +++ b/src/ldt/ldt/__init__.py Wed Jul 23 17:50:04 2014 +0200 @@ -1,6 +1,6 @@ __all__ = ["VERSION", "get_version", "__version__"] -VERSION = (1, 53, 8, "final", 0) +VERSION = (1, 53, 9, "final", 0) def get_version(): diff -r 6c7a7cd62492 -r ae211f69b159 src/ldt/ldt/ldt_utils/projectserializer.py --- a/src/ldt/ldt/ldt_utils/projectserializer.py Wed Jul 23 17:40:18 2014 +0200 +++ b/src/ldt/ldt/ldt_utils/projectserializer.py Wed Jul 23 17:50:04 2014 +0200 @@ -41,7 +41,7 @@ self.first_cutting = first_cutting self.only_one_cutting = only_one_cutting # if first_cutting, it means that we limit to the concerned media= - self.one_content= None + self.one_content= False def __parse_views(self, display_node_list): @@ -531,7 +531,7 @@ self.__parse_ensemble(ensemble_node, content) - def serialize_to_cinelab(self, one_content_param): + def serialize_to_cinelab(self, one_content_param=False): res = {} diff -r 6c7a7cd62492 -r ae211f69b159 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Wed Jul 23 17:40:18 2014 +0200 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Wed Jul 23 17:50:04 2014 +0200 @@ -12,7 +12,7 @@ if (typeof jQuery == "undefined") { jQuery = IriSP.jQuery; } -var metadatas = {metadata: {url: '{{json_url}}?onecontent=1' }}; +var metadatas = {metadata: {url: '{{json_url}}{% if "?" in json_url %}&{% else %}?{% endif %}onecontent=1' }}; var metadata_key = "metadata"; IriSP.libFiles.defaultDir = '{% static "ldt/js/" %}';