sync

diff --git a/DataObjects/Core_setting.php b/DataObjects/Core_setting.php
index 97ec8bd..e1eea76 100644 (file)
--- a/DataObjects/Core_setting.php
+++ b/DataObjects/Core_setting.php
@@ -55,7 +55,11 @@ class Pman_Core_DataObjects_Core_setting extends DB_DataObject
     
     function beforeInsert($q, $roo)
     {
-        exit;
+        if (isset($q['is_encrypt'])) {
+            $roo->jerr("no direct access for setting encrypted data at present?");
+        }
+        // we store column data in here now - so it has to be insertable.
+        //exit;
     }
     
     function getKeyDirectory()

diff --git a/Pman.Download.js b/Pman.Download.js
index 1c98512..51132be 100644 (file)
--- a/Pman.Download.js
+++ b/Pman.Download.js
@@ -332,7 +332,7 @@ Roo.apply(Pman.Download.prototype, {
             
             Roo.each(this.grid.cm.config, function(c,i) {
                 
-                if (t.hiddenCols == 'hide' && t.grid.cm.isHidden(i)) {
+                if (t.hiddenCols != 'show' && t.grid.cm.isHidden(i)) {
                     return;
                 }