#1268: Update hyperlink to gloss on update annotation.

Signbank · Jul 2, 2024 · c645bca · c645bca
1 parent ec21833
commit c645bca
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/media/js/glosses_toggle_edit.js b/media/js/glosses_toggle_edit.js
@@ -156,6 +156,7 @@ function toggle_language_fields(data) {
  return;
  };
  var glossid = data.glossid;
+ var default_annotation = data.default_annotation;
  var errors = data.errors;
  var updatestatus = data.updatestatus;
  if (errors) {
@@ -168,6 +169,11 @@ function toggle_language_fields(data) {
  glossCell = glossCell + "</ul>";
  errorsElt.html(glossCell);
  }
+ var default_annotation_lookup = '#gloss_default_annotation_link_' + glossid;
+ var annotationElt = $(default_annotation_lookup);
+ var annotationCell = '<a href="'+url+'/dictionary/gloss/'+glossid+'/">'+default_annotation+'</a>';
+ annotationElt.html(annotationCell);
+
  var status_lookup = '#status_' + glossid;
  var statusElt = $(status_lookup);
  var statusCell = "<span>"+updatestatus+"</span>";

diff --git a/signbank/dictionary/batch_edit.py b/signbank/dictionary/batch_edit.py
@@ -293,9 +293,12 @@ def batch_edit_update_gloss(request, glossid):
  result = dict()
 
  gloss = get_object_or_404(Gloss, id=glossid)
+ default_language_2char = gloss.lemma.dataset.default_language.language_code_2char
 
  value_dict = get_value_dict(request, gloss)
  language_fields_dict = get_gloss_language_fields(gloss)
+
+ default_annotation_field = 'annotation_' + glossid + '_' + default_language_2char
  fields_to_update = dict()
  for key in value_dict.keys():
  if value_dict[key] != language_fields_dict[key]:
@@ -304,13 +307,15 @@ def batch_edit_update_gloss(request, glossid):
  if not fields_to_update:
  saved_text = gettext("No changes were found.")
  result['glossid'] = glossid
+ result['default_annotation'] = language_fields_dict[default_annotation_field]
  result['errors'] = []
  result['updatestatus'] = saved_text
  return result
 
  errors = check_constraints_on_gloss_language_fields(gloss, fields_to_update)
  if errors:
  result['glossid'] = glossid
+ result['default_annotation'] = language_fields_dict[default_annotation_field]
  result['errors'] = errors
  result['updatestatus'] = "&#10060;"
  return result
@@ -336,6 +341,10 @@ def batch_edit_update_gloss(request, glossid):
 
  saved_text = gettext("Gloss saved to dataset")
  result['glossid'] = glossid
+ if default_annotation_field in fields_to_update.keys():
+ result['default_annotation'] = fields_to_update[default_annotation_field]
+ else:
+ result['default_annotation'] = language_fields_dict[default_annotation_field]
  result['errors'] = []
  result['updatestatus'] = saved_text + " &#x2713;"
 

diff --git a/signbank/dictionary/templates/dictionary/admin_batch_edit_view.html b/signbank/dictionary/templates/dictionary/admin_batch_edit_view.html
@@ -17,7 +17,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.5/js/select2.full.js"></script>
 
 <script type='text/javascript'>
-var url = '{{ PREFIX_URL }}';
+var url = '{{PREFIX_URL}}';
 var saving_str = '{{saving_str|escapejs}}';
 var csrf_token = '{{csrf_token}}';
 var multiple_select_fields = {{MULTIPLE_SELECT_GLOSS_FIELDS|safe}};
@@ -334,7 +334,7 @@ <h4>{% trans "On initial view, the most recent query results are shown." %}</h4>
  </td>
  </tr>
  <tr>
- <td>
+ <td id='gloss_default_annotation_link_{{gloss.id}}'>
  <a href="{{PREFIX_URL}}/dictionary/gloss/{{gloss.pk}}/">
  {{gloss|get_default_annotation_idgloss_translation}}</a>
  </td>
@@ -640,6 +640,7 @@ <h4>{% trans "On initial view, the most recent query results are shown." %}</h4>
  </div>
 
  </div>
+ </div>
  </td>
 
  </tr>
@@ -672,7 +673,7 @@ <h4>{% trans "On initial view, the most recent query results are shown." %}</h4>
  class="quick_similarglosses btn actionButton"
  name='quick_similarglosses_{{gloss.id}}'
  data-glossid='{{gloss.id}}' style="height:26px;"
- type="submit" >{% trans "Show Similar" %}
+ type="submit" >{% trans "Query" %}
  </button>
  </td>
  </tr>

diff --git a/signbank/dictionary/update.py b/signbank/dictionary/update.py
@@ -3524,7 +3524,7 @@ def toggle_namedentity(request, glossid, namedentity):
 
 @permission_required('dictionary.change_gloss')
 def toggle_handedness(request, glossid, handedness):
- print('toggle handedness')
+
  if not request.user.is_authenticated:
  return JsonResponse({})
 

diff --git a/signbank/dictionary/update_glosses.py b/signbank/dictionary/update_glosses.py
@@ -503,7 +503,7 @@ def batch_edit_create_sense(request, glossid):
  new_sense = max(current_senses) + 1
 
  sense_for_gloss, sense_translations = create_empty_sense(gloss, new_sense)
- print(sense_for_gloss)
+
  result = dict()
  result['glossid'] = str(gloss.id)
  result['order'] = new_sense