Fixed a bug where the date range didn't fully work

boboldehampsink · Nov 10, 2015 · 03dd9d2 · 03dd9d2
1 parent 09d78f7
commit 03dd9d2
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 59 deletions.
diff --git a/AuditLogPlugin.php b/AuditLogPlugin.php
@@ -32,7 +32,7 @@ public function getName()
      */
     public function getVersion()
     {
-        return '0.6.1';
+        return '0.6.2';
     }
 
     /**

diff --git a/README.md b/README.md
@@ -16,15 +16,18 @@ Features:
    - modifyAuditLogSortableAttributes
  - Has events that you can listen to
    - auditLog.onElementChanged
- 
+
 Roadmap:
  - Log more ElementTypes (Tags, Globals, Assets)
- 
+
 Important:
 The plugin's folder should be named "auditlog"
 
 Changelog
 =================
+###0.6.2###
+ - Fixed a bug where the date range didn't fully work
+
 ###0.6.1###
  - Added a registerAuditLogSources hook to provide custom sources/criteria
  - Fixed Audit Log not being able to fetch a specific log item
@@ -94,4 +97,4 @@ Warning! This version is updated for Craft 2.3 and does NOT work on Craft 2.2
  - Transformed AuditLog into an ElementType for easier sorting, filtering, searching and pagination
 
 ###0.1.0###
- - Initial push to GitHub
+ - Initial push to GitHub
diff --git a/composer.json b/composer.json
@@ -2,13 +2,13 @@
     "name": "boboldehampsink/auditlog",
     "description": "Audit Log Plugin for Craft CMS",
     "authors": [
-		{
-			"name": "Bob Olde Hampsink",
-			"email": "b.oldehampsink@itmundi.nl"
-		}
-	],
+        {
+            "name": "Bob Olde Hampsink",
+            "email": "b.oldehampsink@itmundi.nl"
+        }
+    ],
     "type": "craft-plugin",
     "require": {
         "composer/installers": "~1.0"
     }
-}
+}
diff --git a/controllers/AuditLogController.php b/controllers/AuditLogController.php
@@ -7,9 +7,9 @@
  *
  * Handles requests for the Audit Log
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
  * @copyright Copyright (c) 2015, Bob Olde Hampsink
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink/auditlog
  */
@@ -20,7 +20,6 @@ class AuditLogController extends BaseController
      */
     public function actionDownload()
     {
-
         // Get criteria
         $criteria = craft()->elements->getCriteria('AuditLog', craft()->request->getParam('criteria'));
 

diff --git a/elementtypes/AuditLogElementType.php b/elementtypes/AuditLogElementType.php
@@ -7,9 +7,9 @@
  *
  * Makes the log behave as an Element Type
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */
@@ -58,7 +58,6 @@ public function getStatuses()
      */
     public function defineTableAttributes($source = null)
     {
-
         // Define default attributes
         $attributes = array(
             'type'        => Craft::t('Type'),
@@ -87,14 +86,11 @@ public function defineTableAttributes($source = null)
      */
     public function getTableAttributeHtml(BaseElementModel $element, $attribute)
     {
-
         // First give plugins a chance to set this
         $pluginAttributeHtml = craft()->plugins->callFirst('getAuditLogTableAttributeHtml', array($element, $attribute), true);
 
         // Check if that had a valid result
         if ($pluginAttributeHtml) {
-
-            // Return it
             return $pluginAttributeHtml;
         }
 
@@ -104,36 +100,30 @@ public function getTableAttributeHtml(BaseElementModel $element, $attribute)
             // Format dates
             case 'dateCreated':
             case 'dateUpdated':
-
                 return craft()->dateFormatter->formatDateTime($element->$attribute);
                 break;
 
             // Return clickable user link
             case 'user':
-
                 $user = $element->getUser();
 
                 return $user ? '<a href="'.$user->getCpEditUrl().'">'.$user.'</a>' : Craft::t('Guest');
                 break;
 
             // Return clickable event origin
             case 'origin':
-
                 return '<a href="'.preg_replace('/'.craft()->config->get('cpTrigger').'\//', '', UrlHelper::getUrl($element->origin), 1).'">'.$element->origin.'</a>';
                 break;
 
             // Return view changes button
             case 'changes':
-
                 return '<a class="btn" href="'.UrlHelper::getCpUrl('auditlog/'.$element->id).'">'.Craft::t('View').'</a>';
                 break;
 
             // Default behavior
             default:
-
                 return $element->$attribute;
                 break;
-
         }
     }
 
@@ -150,8 +140,8 @@ public function defineCriteriaAttributes()
             'origin'      => AttributeType::String,
             'modified'    => AttributeType::DateTime,
             'status'      => AttributeType::String,
-            'before'      => AttributeType::DateTime,
-            'after'       => AttributeType::DateTime,
+            'from'        => AttributeType::DateTime,
+            'to'          => AttributeType::DateTime,
             'order'       => array(AttributeType::String, 'default' => 'auditlog.id desc'),
         );
     }
@@ -183,14 +173,14 @@ public function modifyElementsQuery(DbCommand $query, ElementCriteriaModel $crit
             $query->andWhere(DbHelper::parseParam('auditlog.id', $criteria->id, $query->params));
         }
 
-        // Check for date after
-        if (!empty($criteria->after)) {
-            $query->andWhere(DbHelper::parseDateParam('auditlog.dateUpdated', '>= '.DateTimeHelper::formatTimeForDb($criteria->after), $query->params));
+        // Check for date from
+        if (!empty($criteria->from)) {
+            $query->andWhere(DbHelper::parseDateParam('auditlog.dateUpdated', '>= '.DateTimeHelper::formatTimeForDb($criteria->from), $query->params));
         }
 
-        // Check for date before
-        if (!empty($criteria->before)) {
-            $query->andWhere(DbHelper::parseDateParam('auditlog.dateUpdated', '<= '.DateTimeHelper::formatTimeForDb($criteria->before), $query->params));
+        // Check for date to
+        if (!empty($criteria->to)) {
+            $query->andWhere(DbHelper::parseDateParam('auditlog.dateUpdated', '<= '.DateTimeHelper::formatTimeForDb($criteria->to), $query->params));
         }
 
         // Check for type
@@ -244,7 +234,6 @@ public function populateElementModel($row)
      */
     public function getSources($context = null)
     {
-
         // Get plugin settings
         $settings = craft()->plugins->getPlugin('AuditLog')->getSettings();
 
@@ -308,7 +297,6 @@ public function getSources($context = null)
      */
     public function defineSortableAttributes()
     {
-
         // Set modified first
         $attributes['dateUpdated'] = Craft::t('Modified');
 

diff --git a/models/AuditLogModel.php b/models/AuditLogModel.php
@@ -7,9 +7,9 @@
  *
  * Contains the log data aswell as some constants
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */

diff --git a/records/AuditLogRecord.php b/records/AuditLogRecord.php
@@ -7,9 +7,9 @@
  *
  * Represents the Audit Log tables in the database
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */

diff --git a/services/AuditLogService.php b/services/AuditLogService.php
@@ -7,9 +7,9 @@
  *
  * Contains logics for logging
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */

diff --git a/services/AuditLog_CategoryService.php b/services/AuditLog_CategoryService.php
@@ -7,9 +7,9 @@
  *
  * Contains logics for logging categories
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */

diff --git a/services/AuditLog_EntryService.php b/services/AuditLog_EntryService.php
@@ -7,9 +7,9 @@
  *
  * Contains logics for logging entries
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */

diff --git a/services/AuditLog_UserService.php b/services/AuditLog_UserService.php
@@ -7,9 +7,9 @@
  *
  * Contains logics for logging users
  *
- * @author    Bob Olde Hampsink <b.oldehampsink@itmundi.nl>
- * @copyright Copyright (c) 2015, author
- * @license   http://buildwithcraft.com/license Craft License Agreement
+ * @author    Bob Olde Hampsink <b.oldehampsink@nerds.company>
+ * @copyright Copyright (c) 2015, Bob Olde Hampsink
+ * @license   MIT
  *
  * @link      http://github.com/boboldehampsink
  */

diff --git a/templates/index.twig b/templates/index.twig
@@ -55,10 +55,10 @@ Craft.elementIndex = Craft.createElementIndex('AuditLog', $('#main'), {
 	showLocaleMenu: 'auto',
 	storageKey:     'elementindex.AuditLog',
 	criteria: {
-	    after: {
+	    from: {
 	        date: $('#auditlog-modified-from-date').val()
 	    },
-	    before: {
+	    to: {
 	        date: $('#auditlog-modified-to-date').val()
 	    }
 	}
@@ -89,10 +89,10 @@ $(document).on('change', 'input.hasDatepicker', function() {
 
     // Get new criteria values
     Craft.elementIndex.settings.criteria = {
-        after: {
+        from: {
             date: $('#auditlog-modified-from-date').val()
         },
-        before: {
+        to: {
             date: $('#auditlog-modified-to-date').val()
         }
     };
@@ -101,4 +101,4 @@ $(document).on('change', 'input.hasDatepicker', function() {
     Craft.elementIndex.updateElements();
 
 });
-{% endblock %}
+{% endblock %}