Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

2015-05-26 13:48:11 -04:00
parent f82049f935 d215869988
commit f19a485f12
2 changed files with 1 additions and 3 deletions
@@ -37,7 +37,7 @@
                </div>
            </div>
            <br />
-            <div class="reporContainer"></div>
+            <div class="reporContainer" style="height:auto"></div>

            <div class="listBottomPaging">
            </div>
@@ -999,8 +999,6 @@
            var delimiter = '|';
            result.map(function (item) {

-                filters = (delimiter + filters).replace(delimiter + item.FieldName, '').substring(1);
-
                if (item.Visible)
                    filters = filters ? (filters + delimiter + item.FieldName) : item.FieldName;
            });