Skip to content
Snippets Groups Projects
Commit bd6f9458 authored by Inga Kirschnick's avatar Inga Kirschnick
Browse files

some testing

parent b0f61b28
No related branches found
No related tags found
No related merge requests found
...@@ -81,13 +81,10 @@ def corpus(corpus_id): ...@@ -81,13 +81,10 @@ def corpus(corpus_id):
db.session.commit() db.session.commit()
flash('Your changes have been saved') flash('Your changes have been saved')
return redirect(url_for('.corpus', corpus_id=corpus.id)) return redirect(url_for('.corpus', corpus_id=corpus.id))
# if corpus.following_users == [None]: # following_users = [
# following_users = [] # u.to_json_serializeable() for u
# else: # in corpus.following_users
# following_users = [ # ]
# u.to_json_serializeable() for u
# in corpus.following_users
# ]
return render_template( return render_template(
'corpora/corpus.html.j2', 'corpora/corpus.html.j2',
corpus_settings_form=corpus_settings_form, corpus_settings_form=corpus_settings_form,
......
...@@ -650,6 +650,10 @@ class User(HashidMixin, UserMixin, db.Model): ...@@ -650,6 +650,10 @@ class User(HashidMixin, UserMixin, db.Model):
x.hashid: x.to_json_serializeable(relationships=True) x.hashid: x.to_json_serializeable(relationships=True)
for x in self.spacy_nlp_pipeline_models 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 filter_by_privacy_settings:
if not self.has_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL): if not self.has_profile_privacy_setting(ProfilePrivacySettings.SHOW_EMAIL):
......
...@@ -17,7 +17,7 @@ class CorpusFileList extends ResourceList { ...@@ -17,7 +17,7 @@ class CorpusFileList extends ResourceList {
}); });
}); });
app.getUser(this.userId).then((user) => { 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; this.isInitialized = true;
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment