From 59e7598e7db317122a57ec2696bd4aa88cd7c9f9 Mon Sep 17 00:00:00 2001 From: Leonard Smith Date: Wed, 7 Oct 2020 11:32:58 -0500 Subject: [PATCH] Fix some malformed property names --- app/components/words/word-row.hbs | 2 +- app/models/verse.js | 4 ++-- app/models/word.js | 6 ++++-- app/services/word-select.js | 4 ++-- app/templates/verse.hbs | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/components/words/word-row.hbs b/app/components/words/word-row.hbs index eb558da..531caf0 100644 --- a/app/components/words/word-row.hbs +++ b/app/components/words/word-row.hbs @@ -1,4 +1,4 @@ - + {{@model.greek}} {{@model.ulb}} {{@model.morph}} diff --git a/app/models/verse.js b/app/models/verse.js index 0e9c779..11d5bdd 100644 --- a/app/models/verse.js +++ b/app/models/verse.js @@ -2,8 +2,8 @@ import Model, { attr, hasMany, belongsTo } from '@ember-data/model'; export default class VerseModel extends Model { @attr name; - @attr greek_text; - @attr ulb_text; + @attr greekText; + @attr ulbText; @attr reference; @belongsTo('chapter') chapter; diff --git a/app/models/word.js b/app/models/word.js index fdb1793..68493f0 100644 --- a/app/models/word.js +++ b/app/models/word.js @@ -5,8 +5,10 @@ export default class WordModel extends Model { @attr greek; @attr lemma; @attr morph; - @attr ognt_sort; - @attr strongs_number; + @attr ogntSort; + @attr strongsNumber; @belongsTo('verse') verse; + + @belongsTo('lexical-entry') lexicalEntry; } diff --git a/app/services/word-select.js b/app/services/word-select.js index 2fdad20..e02310b 100644 --- a/app/services/word-select.js +++ b/app/services/word-select.js @@ -13,10 +13,10 @@ export default class WordSelectService extends Service { } isCurrentByOgntId(word) { - return word.ognt_sort == this.currentWord.ognt_sort; + return word.ogntSort == this.currentWord.ogntSort; } isCurrentByStrongsNumber(word) { - return word.strongs_number == this.currentWord.strongs_number + return word.strongsNumber == this.currentWord.strongsNumber } } diff --git a/app/templates/verse.hbs b/app/templates/verse.hbs index ec34157..d36ab2f 100644 --- a/app/templates/verse.hbs +++ b/app/templates/verse.hbs @@ -5,7 +5,7 @@

Greek

ULB

-

{{model.ulb_text}}

+

{{model.ulbText}}