update some jquery addon .less files to properly include all needed s…

…ystem .less files; fix warning in form controller
exponentcms · Oct 30, 2017 · 6dc15b9 · 6dc15b9
1 parent 19d7688
commit 6dc15b9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/external/jquery/addons/less/bootstrap-dialog.less b/external/jquery/addons/less/bootstrap-dialog.less
@@ -1,7 +1,7 @@
+@import "../../../bootstrap3/less/mixins.less";
 @import "../../../bootstrap3/less/variables.less";  //exp Just in case themes aren't overriding all variables
 @import "../../../bootstrap3/less/@{swatch}/variables.less"; //exp Modify this for custom colors, font-sizes, etc
 @import "../@{themepath}/variables.less"; //exp Modify this for theme colors, font-sizes, etc
-@import "../../../bootstrap3/less/mixins.less";
 
 .bootstrap-dialog {
 

diff --git a/external/jquery/addons/less/bootstrap-fileupload.less b/external/jquery/addons/less/bootstrap-fileupload.less
@@ -1,6 +1,7 @@
 @import "../../../bootstrap/less/mixins.less";
 @import "../../../bootstrap/less/variables.less";
 @import "../../../bootstrap/less/@{swatch}/variables.less";
+
 // Fileupload.less
 // CSS for file upload button and fileupload widget
 // ------------------------------------------------

diff --git a/external/jquery/addons/less/fileinput.less b/external/jquery/addons/less/fileinput.less
@@ -1,5 +1,8 @@
+@import "../../../bootstrap3/less/mixins.less";
 @import "../../../bootstrap3/less/variables.less";
 @import "../../../bootstrap3/less/@{swatch}/variables.less";
+@import "../@{themepath}/variables.less"; //exp Modify this for theme colors, font-sizes, etc
+
 // Fileinput.less
 // CSS for file upload button and fileinput widget
 // ------------------------------------------------

diff --git a/framework/modules/forms/controllers/formsController.php b/framework/modules/forms/controllers/formsController.php
@@ -178,6 +178,8 @@ public function showall() {
                 }
 
                 $limit = (isset($this->params['limit']) && $this->params['limit'] != '') ? $this->params['limit'] : 10;
+                if (empty($this->params['view']))
+                    $this->params['view'] = null;
                 if ($this->params['view'] !== 'showall_portfolio')
                     $limit = 0;