fix: category draft non localised blocks issue and code refactor

AcclaroInc · Aug 1, 2022 · e7972b6 · e7972b6
1 parent 5028332
commit e7972b6
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/src/controllers/AssetController.php b/src/controllers/AssetController.php
@@ -19,6 +19,11 @@ public function actionEditDraft(array $variables = array())
         $data = Craft::$app->getRequest()->resolve()[1];
         $siteService = Craft::$app->getSites();
 
+        /** @var craft\elements\User $currentUser */
+        $currentUser = Craft::$app->getUser()->getIdentity();
+
+        $variables['canEdit'] = $currentUser->can('translations:orders:create');
+
         $site = $siteService->getSiteByHandle($data['site'] ?? $siteService->getCurrentSite()->handle);
 
         if (empty($data['elementId'])) {

diff --git a/src/controllers/CategoryController.php b/src/controllers/CategoryController.php
@@ -29,6 +29,11 @@ public function actionEditDraft(array $variables = array())
     {
         $variables = Craft::$app->getRequest()->resolve()[1];
 
+        /** @var craft\elements\User $currentUser */
+        $currentUser = Craft::$app->getUser()->getIdentity();
+
+        $variables['canEdit'] = $currentUser->can('translations:orders:create');
+
         if (empty($variables['slug'])) {
             Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'Param “{name}” doesn’t exist.', array('name' => 'categoryGroup')));
             return;
@@ -91,14 +96,15 @@ public function actionSaveDraft()
                 Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No draft exists with the ID “{id}”.', array('id' => $draftId)));
                 return;
             }
+
+            $draft->title = $this->request->getParam('title') ?? $draft->title;
+            $draft->slug = $this->request->getParam('slug') ?? $draft->slug;
         } else {
             $draft = Translations::$plugin->categoryDraftRepository->makeNewDraft();
             $draft->id = $category->id;
             $draft->site = $site;
         }
 
-        $fieldsLocation = Craft::$app->getRequest()->getParam('fieldsLocation', 'fields');
-
         $fields = $this->request->getParam('fields') ?? [];
 
         if ($fields) {
@@ -133,7 +139,7 @@ public function actionPublishDraft()
         $category = Translations::$plugin->categoryRepository->getCategoryById($categoryId, $siteId);
 
         if (!$category) {
-            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No category exists with the ID “{id}”.', array('id' => $draft->id)));
+            Craft::$app->getSession()->setError(Translations::$plugin->translator->translate('app', 'No category exists with the ID “{id}”.', array('id' => $categoryId)));
             return;
         }
 

diff --git a/src/services/repository/FileRepository.php b/src/services/repository/FileRepository.php
@@ -13,6 +13,9 @@
 use Craft;
 use Exception;
 use yii\db\Query;
+use craft\elements\Asset;
+use craft\elements\Category;
+use craft\elements\GlobalSet;
 use acclaro\translations\Constants;
 use acclaro\translations\Translations;
 use acclaro\translations\models\FileModel;

diff --git a/src/templates/assets/_editDraft.html → src/templates/assets/_editDraft.twig b/src/templates/assets/_editDraft.html → src/templates/assets/_editDraft.twig
@@ -1,7 +1,6 @@
 {% extends "_layouts/element" %}
 {% import "_includes/forms" as forms %}
 
-{% set canEdit = true %}
 {% set canUpdateSource = canEdit %}
 {% set saveSourceAction = 'translations/asset/save-draft' %}
 {% set deleteSourceAction = 'translations/asset/delete-draft' %}

diff --git a/src/templates/categories/_editDraft.html → src/templates/categories/_editDraft.twig b/src/templates/categories/_editDraft.html → src/templates/categories/_editDraft.twig
@@ -1,5 +1,4 @@
 {% extends "_layouts/element" %}
-{% import "_includes/forms" as forms %}
 
 {% set saveShortcutRedirect = continueEditingUrl %}
 {% set saveSourceAction = 'translations/category/save-draft' %}
@@ -33,7 +32,7 @@
 {% endblock %}
 
 {% block actionButton %}
-<div class="btngroup">
+<div class="btngroup {{ canEdit ? '' : 'disabled noClick' }}">
     <input type="submit" class="btn submit" value="{{ 'Save'|t('app') }}">
     <div class="btn submit menubtn"></div>
     <div class="menu">

diff --git a/src/templates/globals/_editDraft.html → src/templates/globals/_editDraft.twig b/src/templates/globals/_editDraft.html → src/templates/globals/_editDraft.twig
@@ -13,7 +13,7 @@
     </div>
     <div class="select" style="margin-left:0.75em;">
         <select onchange="document.location.href=this.options[this.selectedIndex].value;">
-            <option value="{{ url('globals/'~craft.app.sites.getSiteById(draft.site).handle~'/'~globalSetHandle) }}"{>{{ 'Current'|t }}</option>
+            <option value="{{ url('globals/'~craft.app.sites.getSiteById(draft.site).handle~'/'~globalSetHandle) }}">{{ 'Current'|t }}</option>
             {% for d in drafts %}
             <option value="{{ d.cpEditUrl }}"{% if draftId == d.draftId %} selected{% endif %}>{{ d.name }}</option>
             {% endfor %}