* fixing a few bugs

* deprecating IE8 & 9
zmustapha · Aug 27, 2014 · c9e1642 · c9e1642
1 parent 3c49836
commit c9e1642
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/media/templates/asset_workspace.mustache b/media/templates/asset_workspace.mustache
@@ -590,9 +590,9 @@
                                                         <span>
                                                             {{#term_set}}
                                                                 <a href="#" class="switcher-choice filterbyvocabulary" 
-                                                                    data-vocabulary-id="vocabulary-{{term__vocabulary__id}}"
-                                                                    data-term-id="{{term__id}}">
-                                                                    {{term__display_name}} ({{count}})</a> {{^last}}, {{/last}} 
+                                                                    data-vocabulary-id="vocabulary-{{vocabulary_id}}"
+                                                                    data-term-id="{{id}}">
+                                                                    {{display_name}} ({{count}})</a> {{^last}}, {{/last}} 
                                                             {{/term_set}}
                                                         </span>
                                                     </div>

diff --git a/mediathread/assetmgr/views.py b/mediathread/assetmgr/views.py
@@ -460,8 +460,8 @@ def get(self, request, asset_id):
             # projects & discussions title, object_pk, content_type, modified
             indicies = DiscussionIndex.objects.filter(
                 asset=asset).order_by('-modified')
-            ctx['references'] = DiscussionIndexResource().render_list(request,
-                                                                      indicies)
+            ctx.update(DiscussionIndexResource().render_list(request,
+                                                             indicies))
 
             return self.render_to_json_response(ctx)
         except Asset.DoesNotExist:

diff --git a/mediathread/projects/api.py b/mediathread/projects/api.py
@@ -83,11 +83,12 @@ def render_one(self, request, project, version_number=None):
         assets = {}
         notes = []
         for note in project.citations():
-            key = '%s_%s' % (rand, note.asset.pk)
             notes.append(sherd_resource.render_one(request, note, rand))
-            if (note.title not in ["Annotation Deleted", 'Asset Deleted'] and
-                    key not in assets.keys()):
-                assets[key] = asset_resource.render_one(request, note.asset)
+            if (note.title not in ["Annotation Deleted", 'Asset Deleted']):
+                key = '%s_%s' % (rand, note.asset.pk)
+                if key not in assets.keys():
+                    assets[key] = \
+                        asset_resource.render_one(request, note.asset)
 
         data = {
             'project': project_ctx,

diff --git a/mediathread/templates/base.html b/mediathread/templates/base.html
@@ -241,7 +241,7 @@ <h4 id="logo_ccnmtl">
                 });
 
                 /* Select from list: Chrome, Firefox, Safari, MSIE */
-                shieldbrowser({"Chrome": 1, "Firefox": 3.6, "Safari": 4, "MSIE": 8 });
+                shieldbrowser({"Chrome": 1, "Firefox": 3.6, "Safari": 4, "MSIE": 10 });
 
                 jQuery("div.settings_menu").click(function(evt) {
                     evt.stopPropagation();