BUG Update modal API for Reactstrap in SilverStripe 4.2, bump constraint

silverstripe · Jun 25, 2018 · 6c56694 · 6c56694
1 parent 53ecc52
commit 6c56694
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/client/dist/js/contentreview.js b/client/dist/js/contentreview.js
diff --git a/client/src/bundles/ContentReviewForm.js b/client/src/bundles/ContentReviewForm.js
@@ -16,7 +16,9 @@ jQuery.entwine('ss', ($) => {
    * Kick off a "content due for review" dialog from the CMS actions.
    */
   $('.cms-content-actions .content-review__button').entwine({
-    onclick() {
+    onclick(event) {
+      event.preventDefault();
+
       let dialog = $('#content-review__dialog-wrapper');
 
       if (!dialog.length) {
@@ -41,7 +43,7 @@ jQuery.entwine('ss', ($) => {
   });
 
 	/**
-   * Uses React-Bootstrap in order to replicate the bootstrap styling and JavaScript behaviour.
+   * Uses reactstrap in order to replicate the bootstrap styling and JavaScript behaviour.
    */
   $('#content-review__dialog-wrapper').entwine({
     onunmatch() {
@@ -57,7 +59,7 @@ jQuery.entwine('ss', ($) => {
       this._renderModal(false);
     },
 
-    _renderModal(show) {
+    _renderModal(isOpen) {
       const handleHide = () => this.close();
       const handleSubmit = (...args) => this._handleSubmitModal(...args);
       const id = $('form.cms-edit-form :input[name=ID]').val();
@@ -71,9 +73,9 @@ jQuery.entwine('ss', ($) => {
       ReactDOM.render(
         <FormBuilderModal
           title={title}
-          show={show}
+          isOpen={isOpen}
           onSubmit={handleSubmit}
-          onHide={handleHide}
+          onClosed={handleHide}
           schemaUrl={modalSchemaUrl}
           bodyClassName="modal__dialog"
           className="content-review-modal"

diff --git a/composer.json b/composer.json
@@ -21,10 +21,10 @@
     ],
     "require": {
         "silverstripe/vendor-plugin": "^1",
-        "silverstripe/framework": "^4",
-        "silverstripe/cms": "^4",
-        "silverstripe/reports": "^4",
-        "silverstripe/siteconfig": "^4"
+        "silverstripe/framework": "^4.2",
+        "silverstripe/cms": "^4.2",
+        "silverstripe/reports": "^4.2",
+        "silverstripe/siteconfig": "^4.2"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",

diff --git a/src/Extensions/SiteTreeContentReview.php b/src/Extensions/SiteTreeContentReview.php
@@ -491,7 +491,7 @@ public function advanceReviewDate()
                 DBDatetime::now()->getTimestamp()
             );
 
-            $this->owner->NextReviewDate = DBDate::create()->setValue($nextDateTimestamp)->Format('y-MM-dd');
+            $this->owner->NextReviewDate = DBDate::create()->setValue($nextDateTimestamp)->Format(DBDate::ISO_DATE);
             $this->owner->write();
         }
 

diff --git a/src/Forms/ReviewContentHandler.php b/src/Forms/ReviewContentHandler.php
@@ -2,6 +2,8 @@
 
 namespace SilverStripe\ContentReview\Forms;
 
+use SilverStripe\ContentReview\Extensions\SiteTreeContentReview;
+use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Core\Injector\Injectable;
@@ -84,6 +86,7 @@ public function Form($object)
      */
     public function submitReview($record, $data)
     {
+        /** @var DataObject|SiteTreeContentReview $record */
         if (!$this->canSubmitReview($record)) {
             throw new ValidationException(_t(
                 __CLASS__ . '.ErrorReviewPermissionDenied',