Merge branch 'develop'

enupal · Apr 27, 2018 · 832bf55 · 832bf55
2 parents 70f1d2a + 09e3fea
commit 832bf55
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Enupal Backup Changelog
 
+## 1.0.12 - 2018.04.27
+### Fixed
+- Fixed bug related to reflection class not found in some scenarios. 
+
 ## 1.0.11 - 2018.04.10
 ### Improved
 - Improved general performance

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "enupal/backup",
   "description": "Fully integrated Backup solution for Craft CMS",
   "type": "craft-plugin",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/templates/_layouts/settings.twig b/src/templates/_layouts/settings.twig
@@ -61,4 +61,4 @@
 
 {% endset %}
 
-{% do view.registerAssetBundle("enupal\\backup\\assetbundles\\FontAwesomeAsset") %}
+{% do view.registerAssetBundle("enupal\\backup\\web\\assets\\FontAwesomeAsset") %}
diff --git a/src/templates/backups/_viewBackup.twig b/src/templates/backups/_viewBackup.twig
@@ -213,8 +213,8 @@
 	</div>
 {% endblock %}
 
-{% do view.registerAssetBundle("enupal\\backup\\assetbundles\\BackupAsset") %}
-{% do view.registerAssetBundle("enupal\\backup\\assetbundles\\FontAwesomeAsset") %}
+{% do view.registerAssetBundle("enupal\\backup\\web\\assets\\BackupAsset") %}
+{% do view.registerAssetBundle("enupal\\backup\\web\\assets\\FontAwesomeAsset") %}
 {% js %}
 	$(document).ready(function() {
 	new EnupalBackup();

diff --git a/src/templates/backups/index.twig b/src/templates/backups/index.twig
@@ -10,7 +10,7 @@
 {% extends "enupal-backup/_layouts/elementindex" %}
 {% set title = "Backups"|t %}
 {% set elementType = 'enupal\\backup\\elements\\Backup' %}
-{% do view.registerAssetBundle("enupal\\backup\\assetbundles\\FontAwesomeAsset") %}
+{% do view.registerAssetBundle("enupal\\backup\\web\\assets\\FontAwesomeAsset") %}
 {% block actionButton %}
     <div class="buttons">
         <form id="run-backup" method="post">

diff --git a/src/templates/settings/schedule.twig b/src/templates/settings/schedule.twig
@@ -59,8 +59,8 @@
 			{% set webhookUrl = siteUrl ~ 'enupal-backup/schedule?key='~settings.webhookSecretKey %}
 			<hr>
             {{ forms.field({
-                label: webhookUrl,
-                instructions: "Webhook URL"|t('enupal-backup'),
+                label: "Webhook URL"|t('enupal-backup'),
+                instructions: webhookUrl,
             }, null) }}
 
             {{ forms.field({
@@ -93,7 +93,7 @@
 {% css %}
 
 {% endcss %}
-{% do view.registerAssetBundle("enupal\\backup\\assetBundles\\HighlightAsset") %}
+{% do view.registerAssetBundle("enupal\\backup\\web\\assets\\HighlightAsset") %}
 
 {% js %}
 	$(document).ready(function() {

diff --git a/src/assetBundles/BackupAsset.php → src/web/assets/BackupAsset.php b/src/assetBundles/BackupAsset.php → src/web/assets/BackupAsset.php
@@ -6,7 +6,7 @@
  * @copyright Copyright (c) 2017 Enupal
  */
 
-namespace enupal\backup\assetbundles;
+namespace enupal\backup\web\assets;
 
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;

diff --git a/src/assetBundles/FontAwesomeAsset.php → src/web/assets/FontAwesomeAsset.php b/src/assetBundles/FontAwesomeAsset.php → src/web/assets/FontAwesomeAsset.php
@@ -6,7 +6,7 @@
  * @copyright Copyright (c) 2017 Enupal
  */
 
-namespace enupal\backup\assetbundles;
+namespace enupal\backup\web\assets;
 
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;

diff --git a/src/assetBundles/HighlightAsset.php → src/web/assets/HighlightAsset.php b/src/assetBundles/HighlightAsset.php → src/web/assets/HighlightAsset.php
@@ -6,7 +6,7 @@
  * @copyright Copyright (c) 2017 Enupal
  */
 
-namespace enupal\backup\assetbundles;
+namespace enupal\backup\web\assets;
 
 use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;