diff --git a/app/app/components/document/document-view.js b/app/app/components/document/document-view.js index acf25878..0e99f79a 100644 --- a/app/app/components/document/document-view.js +++ b/app/app/components/document/document-view.js @@ -114,7 +114,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, { let level = 1; let beforePage = this.get('beforePage'); - if (is.not.null(beforePage)) { level = beforePage.get('level'); diff --git a/app/app/models/document.js b/app/app/models/document.js index 91a6335d..b32b2545 100644 --- a/app/app/models/document.js +++ b/app/app/models/document.js @@ -25,7 +25,6 @@ export default Model.extend({ userId: attr('string'), tags: attr('string'), template: attr('boolean'), - layout: attr('string'), // client-side property selected: attr('boolean', { defaultValue: false }), diff --git a/app/app/services/link.js b/app/app/services/link.js index c2815875..80bd107e 100644 --- a/app/app/services/link.js +++ b/app/app/services/link.js @@ -112,21 +112,13 @@ export default Ember.Service.extend({ let documentSlug = is.null(targetDocument) ? "d" : targetDocument.get('slug'); // handle section link - if (link.linkType === "section") { + if (link.linkType === "section" || link.linkType === "tab") { let options = {}; - options['page'] = link.targetId; + options['pageId'] = link.targetId; router.transitionTo('document', link.folderId, folderSlug, link.documentId, documentSlug, { queryParams: options }); return; } - // handle tab link - if (link.linkType === "tab") { - let options = {}; - options['mode'] = 'view'; - router.transitionTo('document.section', link.targetId, { queryParams: options }); - return; - } - // handle document link if (link.linkType === "document") { router.transitionTo('document', link.folderId, folderSlug, link.documentId, documentSlug); diff --git a/app/app/styles/print.scss b/app/app/styles/print.scss index 48c49939..990aaf72 100644 --- a/app/app/styles/print.scss +++ b/app/app/styles/print.scss @@ -11,31 +11,30 @@ @media print { .non-printable, .zone-navigation, - .zone-sidebar { + .zone-sidebar, + #sidebar-wrapper, + .document-heading, + .edit-document-heading, + #sidebar-toggle, + .back-to-space, + .start-section, + .new-section-wizard { display: none !important; } - .zone-content { + #page-content-wrapper, #wrapper { padding: 0 !important; - } - - .document-view { - .attachment-zone, - .document-summary, - .document-tags, - .page-toolbar { - display: none !important; - } - - .non-printable-message, - .print-title { - display: block !important; - } - } - - .doc-layout { - padding: 0 !important; - box-shadow: none !important; margin: 0 !important; } + + .non-printable-message, + .print-title { + display: block !important; + } + + .is-a-tab, .is-a-page { + padding: 0 !important; + margin: 0 !important; + box-shadow: none !important; + } } diff --git a/app/app/styles/view/document/view.scss b/app/app/styles/view/document/view.scss index f479ec0b..12b0067f 100644 --- a/app/app/styles/view/document/view.scss +++ b/app/app/styles/view/document/view.scss @@ -129,7 +129,7 @@ padding: 0px 50px; height: 65px; overflow: hidden; - cursor: normal; + cursor: default; .page-title { > .page-toolbar { diff --git a/app/app/templates/components/document/document-heading.hbs b/app/app/templates/components/document/document-heading.hbs index fe0e3805..2dbc6ca1 100644 --- a/app/app/templates/components/document/document-heading.hbs +++ b/app/app/templates/components/document/document-heading.hbs @@ -1,5 +1,5 @@ {{#unless editMode}} -
+

{{document.name}}

{{document.excerpt}}
diff --git a/core/api/endpoint/templates_endpoint.go b/core/api/endpoint/templates_endpoint.go index 3f12455d..49f617a5 100644 --- a/core/api/endpoint/templates_endpoint.go +++ b/core/api/endpoint/templates_endpoint.go @@ -340,7 +340,6 @@ func StartDocumentFromSavedTemplate(w http.ResponseWriter, r *http.Request) { d.Excerpt = "A new document" d.Slug = utility.MakeSlug(d.Title) d.Tags = "" - d.Layout = "doc" d.LabelID = folderID documentID := util.UniqueID() d.RefID = documentID diff --git a/core/api/entity/objects.go b/core/api/entity/objects.go index 8c272387..af1e26ed 100644 --- a/core/api/entity/objects.go +++ b/core/api/entity/objects.go @@ -153,7 +153,6 @@ type Document struct { Slug string `json:"-"` Tags string `json:"tags"` Template bool `json:"template"` - Layout string `json:"layout"` } // SetDefaults ensures on blanks and cleans. @@ -163,8 +162,6 @@ func (d *Document) SetDefaults() { if len(d.Title) == 0 { d.Title = "Document" } - - d.Layout = "doc" } // Attachment represents an attachment to a document. diff --git a/core/api/request/document.go b/core/api/request/document.go index 3f17c3f7..ae88605d 100644 --- a/core/api/request/document.go +++ b/core/api/request/document.go @@ -28,11 +28,8 @@ func (p *Persister) AddDocument(document entity.Document) (err error) { document.OrgID = p.Context.OrgID document.Created = time.Now().UTC() document.Revised = document.Created // put same time in both fields - if document.Layout == "" { - document.Layout = "doc" - } - stmt, err := p.Context.Transaction.Preparex("INSERT INTO document (refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") + stmt, err := p.Context.Transaction.Preparex("INSERT INTO document (refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") defer utility.Close(stmt) if err != nil { @@ -40,7 +37,7 @@ func (p *Persister) AddDocument(document entity.Document) (err error) { return } - _, err = stmt.Exec(document.RefID, document.OrgID, document.LabelID, document.UserID, document.Job, document.Location, document.Title, document.Excerpt, document.Slug, document.Tags, document.Template, document.Layout, document.Created, document.Revised) + _, err = stmt.Exec(document.RefID, document.OrgID, document.LabelID, document.UserID, document.Job, document.Location, document.Title, document.Excerpt, document.Slug, document.Tags, document.Template, document.Created, document.Revised) if err != nil { log.Error("Unable to execute insert for document", err) @@ -52,7 +49,7 @@ func (p *Persister) AddDocument(document entity.Document) (err error) { // GetDocument fetches the document record with the given id fromt the document table and audits that it has been got. func (p *Persister) GetDocument(id string) (document entity.Document, err error) { - stmt, err := Db.Preparex("SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? and refid=?") + stmt, err := Db.Preparex("SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? and refid=?") defer utility.Close(stmt) if err != nil { @@ -111,7 +108,7 @@ func (p *Persister) GetDocumentMeta(id string) (meta entity.DocumentMeta, err er // GetDocuments returns a slice containg all of the the documents for the client's organisation, with the most recient first. func (p *Persister) GetDocuments() (documents []entity.Document, err error) { - err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 ORDER BY revised DESC", p.Context.OrgID) + err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 ORDER BY revised DESC", p.Context.OrgID) if err != nil { log.Error(fmt.Sprintf("Unable to execute select documents for org %s", p.Context.OrgID), err) @@ -123,7 +120,7 @@ func (p *Persister) GetDocuments() (documents []entity.Document, err error) { // GetDocumentsByFolder returns a slice containing the documents for a given folder, most recient first. func (p *Persister) GetDocumentsByFolder(folderID string) (documents []entity.Document, err error) { - err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 AND labelid=? ORDER BY revised DESC", p.Context.OrgID, folderID) + err = Db.Select(&documents, "SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 AND labelid=? ORDER BY revised DESC", p.Context.OrgID, folderID) if err != nil { log.Error(fmt.Sprintf("Unable to execute select documents for org %s", p.Context.OrgID), err) @@ -139,7 +136,7 @@ func (p *Persister) GetDocumentsByTag(tag string) (documents []entity.Document, tagQuery := "tags LIKE '%#" + tag + "#%'" err = Db.Select(&documents, - `SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 AND `+tagQuery+` AND labelid IN + `SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 AND `+tagQuery+` AND labelid IN (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))) @@ -164,7 +161,7 @@ func (p *Persister) GetDocumentsByTag(tag string) (documents []entity.Document, // GetDocumentTemplates returns a slice containing the documents available as templates to the client's organisation, in title order. func (p *Persister) GetDocumentTemplates() (documents []entity.Document, err error) { err = Db.Select(&documents, - `SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=1 AND labelid IN + `SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=1 AND labelid IN (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))) @@ -206,7 +203,7 @@ AND d.template=0`, orgID) // GetDocumentList returns a slice containing the documents available as templates to the client's organisation, in title order. func (p *Persister) GetDocumentList() (documents []entity.Document, err error) { err = Db.Select(&documents, - `SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, layout, created, revised FROM document WHERE orgid=? AND template=0 AND labelid IN + `SELECT id, refid, orgid, labelid, userid, job, location, title, excerpt, slug, tags, template, created, revised FROM document WHERE orgid=? AND template=0 AND labelid IN (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))) @@ -304,7 +301,7 @@ func (p *Persister) SearchDocument(keywords string) (results []entity.DocumentSe func (p *Persister) UpdateDocument(document entity.Document) (err error) { document.Revised = time.Now().UTC() - stmt, err := p.Context.Transaction.PrepareNamed("UPDATE document SET labelid=:labelid, userid=:userid, job=:job, location=:location, title=:title, excerpt=:excerpt, slug=:slug, tags=:tags, template=:template, layout=:layout, revised=:revised WHERE orgid=:orgid AND refid=:refid") + stmt, err := p.Context.Transaction.PrepareNamed("UPDATE document SET labelid=:labelid, userid=:userid, job=:job, location=:location, title=:title, excerpt=:excerpt, slug=:slug, tags=:tags, template=:template, revised=:revised WHERE orgid=:orgid AND refid=:refid") defer utility.Close(stmt) if err != nil { diff --git a/core/database/to-remove.md b/core/database/to-remove.md new file mode 100644 index 00000000..2650cb3a --- /dev/null +++ b/core/database/to-remove.md @@ -0,0 +1,5 @@ +TODO +----- + +1. Remove audit table +2. Remove document.layout field