hopfma/om
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/developer' into developer

Browse Source 
# Conflicts:
#	public/routes/createMessage.js
This commit is contained in:
Xenia Gruenzinger 2019-06-27 11:15:42 +02:00
commit ab358abe98
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/routes/createMessage.js
View File

@ -112,8 +112,8 @@ const CreateMsgRouter = {
function get_insert_tag(id){ function get_insert_tag(id){
$.ajax({ url: "api/tag/"+id, method: "GET" }).done(function (tag) { $.ajax({ url: "api/tag/"+id, method: "GET" }).done(function (tag) {
data.push("#"+tag.name); data.push("#" + tag.name);
console.log("it worked!"); console.log("Array:"+this.data);
}).fail(function (e, f, g) { }).fail(function (e, f, g) {
console.log("cannot load " + id + ".json: " + e + f + g); console.log("cannot load " + id + ".json: " + e + f + g);
}) })

2
server/dbs.js
View File

@ -184,7 +184,7 @@ const dbs = {
_comment: "" }, _comment: "" },
//createtime: { type: Date, default: Date.now }, //createtime: { type: Date, default: Date.now },
}); });
messageSchema.index({ tag:'text', subject:'text', message:'text', user:'text' }); messageSchema.index({ "$**":'text' });
model.Messages = common.mongoose.model('messages', messageSchema); model.Messages = common.mongoose.model('messages', messageSchema);
model.Messages._list = [ "" ]; model.Messages._list = [ "" ];