Browse Source

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

# Conflicts:
#	public/routes/createMessage.js
master
Xenia Gruenzinger 5 years ago
parent
commit
ab358abe98
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      public/routes/createMessage.js
  2. 1
    1
      server/dbs.js

+ 2
- 2
public/routes/createMessage.js View File



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);
console.log("it worked!");
data.push("#" + tag.name);
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);
}) })

+ 1
- 1
server/dbs.js View File

_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 = [ "" ];



Loading…
Cancel
Save