diff --git a/domain/page/endpoint.go b/domain/page/endpoint.go index 0df08b2c..c17c88dd 100644 --- a/domain/page/endpoint.go +++ b/domain/page/endpoint.go @@ -748,7 +748,9 @@ func (h *Handler) GetMeta(w http.ResponseWriter, r *http.Request) { meta, err := h.Store.Page.GetPageMeta(ctx, pageID) if err == sql.ErrNoRows { response.WriteNotFoundError(w, method, pageID) - h.Runtime.Log.Error(method, err) + h.Runtime.Log.Info(method + " no record") + meta = page.Meta{} + response.WriteJSON(w, meta) return } if err != nil { diff --git a/domain/search/mysql/store.go b/domain/search/mysql/store.go index 337e418b..7b179d18 100644 --- a/domain/search/mysql/store.go +++ b/domain/search/mysql/store.go @@ -278,7 +278,8 @@ func (s Scope) Documents(ctx domain.RequestContext, keywords string) (results [] keywords = strings.Replace(keywords, " ", "", -1) } - keywords = strings.ToLower(strings.TrimSpace(keywords)) + keywords = strings.TrimSpace(keywords) + // keywords = strings.ToLower(keywords) if len(keywords) > 0 { keywordQuery = "AND MATCH(pagetitle,body) AGAINST('" + keywords + "' in boolean mode)" @@ -292,8 +293,6 @@ func (s Scope) Documents(ctx domain.RequestContext, keywords string) (results [] (SELECT refid from label WHERE orgid=? AND type=2 AND userid=? UNION ALL SELECT refid FROM label a where orgid=? AND type=1 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid='' AND (canedit=1 OR canview=1)) UNION ALL SELECT refid FROM label a where orgid=? AND type=3 AND refid IN (SELECT labelid from labelrole WHERE orgid=? AND userid=? AND (canedit=1 OR canview=1))) ` + keywordQuery - // AND MATCH(pagetitle,body) - // AGAINST('` + keywords + "' in boolean mode)" err = s.Runtime.Db.Select(&results, sql, diff --git a/gui/app/components/document/sidebar-view-attachments.js b/gui/app/components/document/sidebar-view-attachments.js index e7ac7771..0075a97d 100644 --- a/gui/app/components/document/sidebar-view-attachments.js +++ b/gui/app/components/document/sidebar-view-attachments.js @@ -25,7 +25,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { init() { this._super(...arguments); - + this.getAttachments(); }, @@ -104,7 +104,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { target: $(".delete-attachment-" + id)[0], content: $(".delete-attachment-dialog")[0], classes: 'drop-theme-basic', - position: "bottom right", + position: "bottom left", openOn: "always", tetherOptions: { offset: "5px 0",