SAK-41677 Remove Rubric tooltip doesn't show correct name (sakaiproje…

…ct#6845)
Spencerx · Apr 23, 2019 · 61acc49 · 61acc49
1 parent cec74d1
commit 61acc49
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/rubrics/api/src/main/bundle/org/sakaiproject/rubrics/bundle/Messages.properties b/rubrics/api/src/main/bundle/org/sakaiproject/rubrics/bundle/Messages.properties
@@ -10,7 +10,7 @@ edit_rubric=Edit Rubric
 edit_criterion=Edit Criterion
 edit_rating=Edit Rating
 copy=Copy
-remove=Remove
+remove=Remove {}
 remove_label=Remove
 cancel=Cancel
 save=Save

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-item-delete.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-item-delete.js
@@ -51,14 +51,14 @@ export class SakaiItemDelete extends SakaiElement {
   render() {
 
     return html`
-      <span role="button" aria-haspopup="true" aria-expanded="${this.popoverOpen}" aria-controls="delete_${this.type}_${this.item.id}" tabindex="0" title="${tr("remove")} ${this.item.title}" class="delete fa fa-times" @click="${this.deleteItem}"></span>
+      <span role="button" aria-haspopup="true" aria-expanded="${this.popoverOpen}" aria-controls="delete_${this.type}_${this.item.id}" tabindex="0" title="${tr("remove", [this.item.title])}" class="delete fa fa-times" @click="${this.deleteItem}"></span>
       <div id="delete_${this.type}_${this.item.id}" class="popover rubric-delete-popover left">
         <div class="arrow"></div>
         <div class="popover-title" tabindex="0">${tr("confirm_remove")} ${this.item.title}</div>
         <div class="popover-content">
           <div class="buttons text-right">
             <button title="${tr("confirm_remove")}" class="btn-primary save" @click="${this.saveDelete}">
-              <sr-lang key="remove" />
+              <sr-lang key="remove_label" />
             </button>
             <button class="cancel" @click="${this.cancelDelete}">
               <sr-lang key="cancel">Cancel</sr-lang>

diff --git a/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric.js b/rubrics/tool/src/main/frontend/webcomponents/sakai-rubric.js
@@ -191,6 +191,9 @@ export class SakaiRubric extends SakaiElement {
       this.rubric = data;
       this.dispatchEvent(new SharingChangeEvent());
       this.handleShareLink();
+      var sakaiItemDelete = this.querySelector("sakai-item-delete");
+      sakaiItemDelete.requestUpdate("item", this.rubric);
+      sakaiItemDelete.requestUpdate("rubric", this.rubric);
     }).fail((jqXHR, textStatus, errorThrown) => {
       console.log("Request failed: " + textStatus);
       console.log("Error: " + errorThrown);