No more draft auto-creation

Resolves #4549 Resolves #4535
craftcms · Jul 15, 2019 · a658ad4 · a658ad4
1 parent f3b9fa0
commit a658ad4
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 225 deletions.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -5,6 +5,11 @@
 ### Added
 - Added `craft\web\UrlManager::setMatchedElement()`.
 
+### Changed
+- Craft no longer creates drafts automatically when editing entries. The user must click a “Save as a Draft” button to create one. ([#4549](https://github.com/craftcms/cms/issues/4549))
+- Entries are now immediately savable, whether or not any changes were made. ([#4535](https://github.com/craftcms/cms/issues/4535))
+- It’s no longer possible to preview entries’ Current revision. A draft must be created first.
+
 ### Fixed
 - Fixed a bug where it wasn’t possible to delete Matrix blocks if Min Blocks and Max Blocks were set to the same value, and an element already had more than that many blocks. ([#4562](https://github.com/craftcms/cms/issues/4562))
 - Fixed a bug where `craft\web\UrlManager::getMatchedElement()` could return the incorrect result on preview requests. ([#4542](https://github.com/craftcms/cms/issues/4542))

diff --git a/src/controllers/EntryRevisionsController.php b/src/controllers/EntryRevisionsController.php
@@ -256,7 +256,6 @@ public function actionSaveDraft()
                 'draftNotes' => $draft->draftNotes,
                 'docTitle' => $this->docTitle($draft),
                 'title' => $this->pageTitle($draft),
-                'duplicatedElements' => $elementsService::$duplicatedElementIds,
             ]);
         }
 

diff --git a/src/templates/_layouts/element.html b/src/templates/_layouts/element.html
@@ -9,6 +9,7 @@
     - canUpdateSource (optional): whether the current user is allowed to update the source element
       (e.g. by publishing a draft or reverting the element to a prior revision).
     - shareUrl (optional): the URL that the Share button should link to.
+    - saveSourceAction: the controller action that should be used to save the source element
     - saveDraftAction: the controller action that should be used to save a draft
     - deleteDraftAction: the controller action that should be used to delete a draft
     - applyDraftAction: the controller action that should be used to apply a draft onto the source element
@@ -31,11 +32,12 @@
         url: element.uri == '__home__' ? '' : element.uri
     }]|merge(previewTargets) %}
 {% endif %}
-{% set enablePreview = previewTargets and not craft.app.request.isMobileBrowser(true) %}
+{% set enablePreview = (isDraft or isRevision) and previewTargets and not craft.app.request.isMobileBrowser(true) %}
 
 {% set canDeleteDraft = isDraft and not isUnsavedDraft and ((canDeleteDraft ?? false) or element.creatorId == currentUser.id) %}
 {% set canUpdateSource = canUpdateSource ?? false %}
 {% set shareUrl = shareUrl ?? null %}
+{% set saveSourceAction = saveSourceAction ?? null %}
 {% set revertSourceAction = revertSourceAction ?? null %}
 
 {% if not isRevision %}
@@ -60,49 +62,60 @@
     {{ block('pageTitle') }}
     {{ block('contextMenu') }}
     <div class="flex-grow"></div>
+
     {% if previewTargets %}
+        <div class="spacer"></div>
         <div class="btngroup">
             {% if enablePreview %}
                 <div id="preview-btn" class="btn">{{ "Preview"|t('app') }}</div>
             {% endif %}
             <div id="share-btn" class="btn">{{ 'Share'|t('app') }}</div>
         </div>
     {% endif %}
-    {{ block('actionButton') }}
-{% endblock %}
 
-{% block contextMenu %}
-    {% include "_includes/revisionmenu" %}
-{% endblock %}
-
-{% block actionButton %}
-    {% if canUpdateSource or isUnsavedDraft %}
-        {% if isRevision %}
-            {% if revertSourceAction %}
-                <div class="spacer"></div>
-                <form method="post" accept-charset="UTF-8">
-                    {{ csrfInput() }}
-                    <input type="hidden" name="action" value="{{ revertSourceAction }}">
-                    {{ redirectInput(element.cpEditUrl) }}
-                    <input type="hidden" name="revisionId" value="{{ element.revisionId }}">
-                    <div class="secondary-buttons">
-                        <input type="button" class="btn submit formsubmit" value="{{ 'Revert {type} to this revision'|t('app', { type: element.displayName()|lower }) }}">
-                    </div>
-                </form>
-            {% endif %}
-        {% else %}
-            <div class="spacer"></div>
-            {% if isUnsavedDraft %}
-                <input type="submit" id="apply-btn" class="btn submit" value="{{ 'Save {type}'|t('app', { type: element.displayName() }) }}">
+    {% block actionButton %}
+        {% if canUpdateSource or isUnsavedDraft %}
+            {% if isRevision %}
+                {% if revertSourceAction %}
+                    <div class="spacer"></div>
+                    <form method="post" accept-charset="UTF-8">
+                        {{ csrfInput() }}
+                        <input type="hidden" name="action" value="{{ revertSourceAction }}">
+                        {{ redirectInput(element.cpEditUrl) }}
+                        <input type="hidden" name="revisionId" value="{{ element.revisionId }}">
+                        <div class="secondary-buttons">
+                            <input type="button" class="btn submit formsubmit" value="{{ 'Revert {type} to this revision'|t('app', { type: element.displayName()|lower }) }}">
+                        </div>
+                    </form>
+                {% endif %}
             {% else %}
-                <input type="submit" id="apply-btn" class="btn submit{% if not isDraft %} disabled{% endif %}" value="{{ 'Update {type}'|t('app', { type: element.displayName() }) }}">
+                <div class="spacer"></div>
+                {% if isUnsavedDraft %}
+                    <input type="submit" id="apply-btn" class="btn submit" value="{{ 'Save {type}'|t('app', { type: element.displayName() }) }}">
+                {% elseif isDraft %}
+                    <input type="submit" id="apply-btn" class="btn submit{% if not isDraft %} disabled{% endif %}" value="{{ 'Update {type}'|t('app', { type: element.displayName() }) }}">
+                {% else %}
+                    {% if saveSourceAction %}
+                        <input type="submit" id="apply-btn" class="btn submit" value="{{ 'Save {type}'|t('app', { type: element.displayName() }) }}">
+                        <div class="spacer"></div>
+                    {% endif %}
+                    {% set draftRedirectUrl =  url(element.cpEditUrl, {draftId: '__DRAFT_ID__'})|replace('__DRAFT_ID__', '{draftId}') %}
+                    <input type="button" id="save-draft-btn" class="btn secondary formsubmit" value="{{ 'Save as a Draft'|t('app') }}" data-action="{{ saveDraftAction }}" data-redirect="{{ draftRedirectUrl|hash }}">
+                {% endif %}
             {% endif %}
         {% endif %}
-    {% endif %}
+    {% endblock %}
+{% endblock %}
+
+{% block contextMenu %}
+    {% include "_includes/revisionmenu" %}
 {% endblock %}
 
 {% block main %}
     {{ redirectInput(element.cpEditUrl) }}
+    {% if not isDraft and not isRevision and saveSourceAction %}
+        <input type="hidden" name="action" value="{{ saveSourceAction }}">
+    {% endif %}
     {% if fullPageForm and craft.app.isMultiSite %}
         <input type="hidden" name="siteId" value="{{ element.siteId }}">
     {% endif %}

diff --git a/src/templates/entries/_edit.html b/src/templates/entries/_edit.html
@@ -6,6 +6,7 @@
 {% set isRevision = entry.getIsRevision() %}
 
 {% set element = entry %}
+{% set saveSourceAction = 'entries/save-entry' %}
 {% set saveDraftAction = 'entry-revisions/save-draft' %}
 {% set deleteDraftAction = 'entry-revisions/delete-draft' %}
 {% set applyDraftAction = 'entry-revisions/publish-draft' %}
@@ -25,7 +26,7 @@
     {% if not isSingle and not isRevision and (canUpdateSource or canDeleteEntry) and not entry.isUnsavedDraft %}
         <div class="spacer"></div>
         <div>
-            <div id="action-menubtn" class="btn menubtn" data-icon="settings" title="{{ 'Actions'|t('app') }}"></div>
+            <div id="action-menubtn" class="btn secondary menubtn" data-icon="settings" title="{{ 'Actions'|t('app') }}"></div>
             <div class="menu">
                 <ul>
                     {% if canUpdateSource %}

diff --git a/src/web/assets/cp/dist/css/_main.scss b/src/web/assets/cp/dist/css/_main.scss
@@ -1078,7 +1078,8 @@ ul.icons li a:hover {
   background-image: url(../images/spinner_submit.gif);
 }
 
-.secondary-buttons .btn.icon.add.loading.submit:after {
+.secondary-buttons .btn.icon.add.loading.submit:after,
+.btn.secondary.icon.add.loading.submit:after {
   background-image: url(../images/spinner_submit_secondary.gif);
 }
 
@@ -1215,12 +1216,16 @@ ul.icons li a:hover {
 }
 
 /* submit buttons */
-.btn.submit {
+.btn.submit,
+.btn.secondary {
   color: #fff;
-  background-image: linear-gradient($submitColor, #cc5643);
   @include light-on-dark-text;
 }
 
+.btn.submit {
+  background-image: linear-gradient($submitColor, #cc5643);
+}
+
 .btn.submit:not(.disabled):not(.inactive):hover,
 .btn.submit:not(.disabled):not(.inactive).hover {
   background-image: linear-gradient($submitHoverColor, #b34b3b);
@@ -1231,17 +1236,22 @@ ul.icons li a:hover {
   background-image: linear-gradient($submitActiveColor, #994032);
 }
 
-.secondary-buttons .btn.submit {
+.secondary-buttons .btn.submit,
+.btn.secondary {
   background-image: linear-gradient($secondarySubmitColor, #878f99);
 }
 
 .secondary-buttons .btn.submit:not(.disabled):not(.inactive):hover,
-.secondary-buttons .btn.submit:not(.disabled):not(.inactive).hover {
+.secondary-buttons .btn.submit:not(.disabled):not(.inactive).hover,
+.btn.secondary:not(.disabled):not(.inactive):hover,
+.btn.secondary:not(.disabled):not(.inactive).hover {
   background-image: linear-gradient($secondarySubmitHoverColor, #697480);
 }
 
 .secondary-buttons .btn.submit:not(.disabled):not(.inactive):active,
-.secondary-buttons .btn.submit:not(.disabled):not(.inactive).active {
+.secondary-buttons .btn.submit:not(.disabled):not(.inactive).active,
+.btn.secondary:not(.disabled):not(.inactive):active,
+.btn.secondary:not(.disabled):not(.inactive).active {
   background-image: linear-gradient($secondarySubmitActiveColor, #697380);
 }
 
@@ -4760,7 +4770,8 @@ only screen and (min-resolution: 1.5dppx) {
   .btn.icon.add.loading.submit:after {
     background-image: url(../images/spinner_submit_2x.gif);
   }
-  .secondary-buttons .btn.icon.add.loading.submit:after {
+  .secondary-buttons .btn.icon.add.loading.submit:after,
+  .btn.secondary.icon.add.loading.submit:after {
     background-image: url(../images/spinner_submit_secondary_2x.gif);
   }
 

diff --git a/src/web/assets/cp/dist/css/craft.css b/src/web/assets/cp/dist/css/craft.css
diff --git a/src/web/assets/cp/dist/css/craft.css.map b/src/web/assets/cp/dist/css/craft.css.map