From bd6f94582b4e8b78b7c239f3898b2eea9679668f Mon Sep 17 00:00:00 2001
From: Inga Kirschnick <inga.kirschnick@uni-bielefeld.de>
Date: Mon, 6 Feb 2023 10:52:36 +0100
Subject: [PATCH] some testing
---
app/corpora/routes.py | 11 ++++-------
app/models.py | 4 ++++
app/static/js/ResourceLists/CorpusFileList.js | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/app/corpora/routes.py b/app/corpora/routes.py
index f2128479..4c1ebd29 100644
--- a/app/corpora/routes.py
+++ b/app/corpora/routes.py
@@ -81,13 +81,10 @@ def corpus(corpus_id):
db.session.commit()
flash('Your changes have been saved')
return redirect(url_for('.corpus', corpus_id=corpus.id))
- # if corpus.following_users == [None]:
- # following_users = []
- # else:
- # following_users = [
- # u.to_json_serializeable() for u
- # in corpus.following_users
- # ]
+ # following_users = [
+ # u.to_json_serializeable() for u
+ # in corpus.following_users
+ # ]
return render_template(
'corpora/corpus.html.j2',
corpus_settings_form=corpus_settings_form,
diff --git a/app/models.py b/app/models.py
index 24f59d60..4c7a1362 100644
--- a/app/models.py
+++ b/app/models.py
@@ -650,6 +650,10 @@ class User(HashidMixin, UserMixin, db.Model):
x.hashid: x.to_json_serializeable(relationships=True)
for x in self.spacy_nlp_pipeline_models
}
+ json_serializeable['followed_corpora'] = {
+ x.hashid: x.to_json_serializeable(relationships=True)
+ for x in self.followed_corpora
+ }
if filter_by_privacy_settings:
if not self.has_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL):
diff --git a/app/static/js/ResourceLists/CorpusFileList.js b/app/static/js/ResourceLists/CorpusFileList.js
index fd4ff480..ca27fe27 100644
--- a/app/static/js/ResourceLists/CorpusFileList.js
+++ b/app/static/js/ResourceLists/CorpusFileList.js
@@ -17,7 +17,7 @@ class CorpusFileList extends ResourceList {
});
});
app.getUser(this.userId).then((user) => {
- this.add(Object.values(user.corpora[this.corpusId].files));
+ this.add(Object.values(user.corpora[this.corpusId].files || user.followed_corpora[this.corpusId].files));
this.isInitialized = true;
});
}
--
GitLab