Commit Graph

91 Commits

Author SHA1 Message Date
Robbie Averill 6a67cddc38 FIX Missing shortcode field and broken Javascript when inserting document in TinyMCE 2017-08-07 11:21:35 +12:00
Robbie Averill 4ba3e3fa60 FIX Remove fragile logic looking for page edit link between SS versions 2017-06-15 14:31:10 +12:00
Franco Springveldt 4bdeb980d9 Merge pull request #177 from creative-commoners/pulls/2.0/fix-page-association-in-addcontroller
FIX Get page ID from document set and include it in $NewLink for add document buttons
2017-06-14 16:14:40 +12:00
Robbie Averill 9d5e028d10 FIX Ensure that redirection back to pages works for SS 3.6 2017-06-14 15:53:37 +12:00
Franco Springveldt 79da01513e FIX document and documentset permissions 2017-06-14 11:18:09 +12:00
Robbie Averill d0c2558a1f FIX Get page ID from document set and include it in $NewLink for add document buttons
This helps the module to determine where to return a user to after they've uploaded a file, e.g. either back to a document set in a page context, back to a document set in the ModelAdmin context or back to the ModelAdmin for documents with no context.
2017-06-14 10:57:00 +12:00
Robbie Averill a76b1d0256 FIX Remove customised delete confirmation message, it taints the global scope 2017-06-13 15:21:22 +12:00
Robbie Averill 1f7b17a2d3 FIX Redirect back to documents tab after uploading a document
Unless you are within a document set or page context
2017-06-13 10:56:26 +12:00
Sacha Judd c10109b49b FIX Re-add i18n Javascript in documents modeladmin 2017-06-12 16:24:23 +12:00
Robbie Averill 772198a7fc FIX Backlink for upload form redirects to document admin if no page is available 2017-06-08 12:26:53 +12:00
Daniel Hensby bacc3db4ef Merge pull request #163 from creative-commoners/pulls/2.0/add-more-tests
Add some more tests
2017-06-07 21:39:18 +01:00
Robbie Averill 4c3206e200 Add tests for the document autocompleter and conditions in getter for page and document set 2017-06-07 17:00:25 +12:00
Franco Springveldt ce37b81c2b NEW pages link to document sets 2017-06-07 15:54:10 +12:00
Franco Springveldt 5824c1b0eb NEW info notices added to QueryBuilder 2017-06-07 10:30:44 +12:00
Sacha Judd cbd3a65fa9 FIX Add 'add document set' button and update label for Page 2017-06-03 08:24:14 +12:00
Robbie Averill cbc53fd7d2 NEW Add ModelAdmin interface for managing DMSDocumentSets 2017-05-29 10:15:21 +12:00
Robbie Averill 9b42effeb5 FIX Refactor SCSS, convert to more BEM-like names, add admin icon
* Remove "small" class from inline edit form for documents
* Swap relationeditor GridFieldConfig for record editor to ensure that document sets can be deleted from a page context rather than unlinked (natively)
* Fix to ensure that related documents can be autocompleted via partial matching on filename
* Add 2 space indentation rule to editorconfig for .js and .scss files
2017-05-22 15:20:16 +12:00
Robbie Averill 489a62abb2 API Remove DMSGridFieldDeleteAction, add query builder filter for taxonomy terms 2017-05-18 17:30:25 +12:00
Robbie Averill 8d2f707f48 FIX Ensure after uploading document you are redirected back to the document set 2017-05-18 11:51:32 +12:00
Franco Springveldt 6b25237ec6 NEW Query Builder functionality added
This enhancement adds the ability to add documents to a document set based on a list of filters added from DMSDocument. Fixes #96
2017-05-16 13:26:01 +12:00
Robbie Averill 513c29aa99 NEW Replace Compass with Webpack, update docs, remove unused @includes 2017-05-09 16:06:57 +12:00
Robbie Averill 1c1b1d2aeb FIX Don't show GridField until set has been saved. Add more tests, fix typos in docs. 2017-05-09 13:06:37 +12:00
Robbie Averill 66abd22ee5 FIX Allow linking existing documents to document sets via add existing upload field 2017-05-09 13:04:29 +12:00
Robbie Averill b80aa645f8 MINOR Add more tests for classes in the "cms" code folder 2017-05-09 13:04:29 +12:00
Robbie Averill e4bc553521 API Add document sets, remove *Page methods from DMSDocument
* Add 2.0.0 changelog
* Update DMSInterface and DMSDocumentInterface removing *page and adding getDocumentSetsByPage to DMSInterface
* Update use documentation and update unit tests

This commit changes the relationship from Pages has_many Documents to Pages has_many DocumentSets which are many_many to Documents. The upload field has been upated to attach documents to a set instead of a page, the tests updated and the DMSInterface and DMSDocumentInterface updated to be less relevant to pages and more relevant to document sets.
2017-05-09 13:04:29 +12:00
Sacha Judd d29a115f7b NEW add DMSDocumentAdmin and new "add document" GridField component
The add new button wasn't modular so have added a GridField component which can be reused
2017-05-04 10:10:20 +12:00
Robbie Averill 39ce206b55 FIX Updates for coding standards, move second classes in files to their own files, fix comments 2017-05-01 15:56:27 +12:00
Florian Thoma fb08e472c6 fix edit after upload (from @benmanu), fixes #53 2016-08-30 12:04:08 +10:00
Daniel Hensby 6e62d65ca3
FIX Backlink computed correctly 2016-05-05 16:18:02 +01:00
helpfulrobot bd707c4ffc Converted to PSR-2 2015-12-18 07:48:37 +13:00
Peter Thaleikis 08ea258e50 Update DMSDocumentAddExistingField.php
removing closing php tag as it isnt required and is excluded in the code style
2015-05-12 20:51:07 +12:00
Will Rossiter d73b13afd5 FIX: Resolve issues with find by page documentlist 2014-01-29 14:40:57 +13:00
Will Rossiter bd8e88e2ab Sort assets by ID so matching '2' doesn't first match newer records 2014-01-15 17:36:59 +13:00
Will Rossiter 8e534e99f2 Make DMSDocument methods chainable. PHPDoc cleanup.
- Remove unimplemented getAllTags()
- Add .DS_Store as ignored file
- Add gridfieldextensions as a declared dependancy.
2014-01-10 15:21:50 +13:00
Will Rossiter 0fb0410718 FIX: Resolve issue of not being able to attach documents on draft pages 2014-01-10 15:21:50 +13:00
Andrew Short 893c10955a BUG: Share session namespace with CMS main when adding documents.
The changes to the session management in 3.1 mean that editing when
uploading a document no longer worked as the page ID was not correctly
managed in the session. This addresses that issue by sharing a session
state with CMSMain.
2013-10-09 00:49:39 +11:00
Andrew Short f718b90b69 BUG: Fix the action buttons not rendering on upload.
Due to escaping API changes, a HTMLText instance was being incorrectly
casted to JSON.
2013-10-08 19:20:18 +11:00
richardmward b74b4f2de1 FIX #29 - 'linkdocument' needed adding to allowed_actions 2013-09-21 11:42:21 +01:00
Stephen Shkardoon 0765b90da8 Merge pull request #28 from ss23/master
FIX #25 - documentautocomplete need allowed_action
2013-09-19 15:18:41 -07:00
Stephen Shkardoon 049a1c8d84 FIX #25 - documentautocomplete need allowed_action 2013-09-20 10:17:30 +12:00
Julian Seidenberg c2639d86d1 Merge pull request #24 from ss23/master
FIX Don't show the upload field when inappropriate
2013-09-10 22:13:14 -07:00
Stephen Shkardoon 8d4b24b68d FIX Don't show the upload field when inappropriate
This fix is quite ugly, but in theory, it's fine. By ugly,
  I mean the interface is kind of weird without it.
Because 3.1 allows uploading when a DataObject doesn't exist,
  we need to override the new defaults to not allow such if
  the DO isn't saved yet.
2013-09-10 21:03:42 +12:00
Stephen Shkardoon 144043c437 3.1 compat -- Add action to allowed_actions 2013-09-10 20:59:59 +12:00
Stephen Shkardoon 45849c5833 Merge pull request #22 from ss23/allowed_actions-3.1
Add allowed_actions to make it work for 3.1
2013-08-28 19:55:16 -07:00
Stephen Shkardoon cb96c474da Add allowed_actions to make it work for 3.1 2013-08-29 14:50:43 +12:00
Ingo Schommer 75899876d2 3.1 compat (controller code) 2013-08-22 17:21:55 +02:00
Normann Lou ea7b2c0471 BUG add $allowed_actions for both DMSDocumentAddController and DMSUploadField 2013-06-26 04:57:36 +12:00
Cam Findlay 5bf804c1af FIX the autocomplete for adding a document to a page that already exists in the DMS. 2013-04-18 13:38:29 +12:00
Cam Findlay 1b6c76b405 Further updates for 3.1 compatibility. 2013-04-15 14:03:58 +12:00
Ingo Schommer 597e393630 BUG DMSUploadField JS template usage
Instead of relying on JavaScript requirements blocking,
configure a more specific template name to use
in certain situations. We can't control JS files
loaded by the browser already by previous requests,
so Requirements blocking does not override the
template in all cases, creating execution-path specific
edge cases (like showing "save to refresh" messages
in the background of a "add document" upload success)
2013-01-07 10:11:55 +13:00