diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java index 4db154a906..7cc30d7d04 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java @@ -19,8 +19,11 @@ package org.apache.nifi.web.api.entity; import com.wordnik.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ProcessGroupDTO; import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO; +import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.Date; /** * A serialized representation of this class can be placed in the entity body of a request or response to or from the API. This particular entity holds a reference to a ProcessGroupDTO. @@ -31,6 +34,7 @@ public class ProcessGroupEntity extends ComponentEntity { private ProcessGroupDTO component; private ProcessGroupStatusDTO status; + private Date currentTime; private Integer runningCount; private Integer stoppedCount; private Integer invalidCount; @@ -179,4 +183,19 @@ public class ProcessGroupEntity extends ComponentEntity { public void setInactiveRemotePortCount(Integer inactiveRemotePortCount) { this.inactiveRemotePortCount = inactiveRemotePortCount; } + + /** + * @return current time on the server + */ + @XmlJavaTypeAdapter(TimeAdapter.class) + @ApiModelProperty( + value = "The current time on the system." + ) + public Date getCurrentTime() { + return currentTime; + } + + public void setCurrentTime(Date currentTime) { + this.currentTime = currentTime; + } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java index e50df8fbd3..565826f3b4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java @@ -110,6 +110,7 @@ public final class EntityFactory { final ProcessGroupEntity entity = new ProcessGroupEntity(); entity.setRevision(revision); + entity.setCurrentTime(new Date()); if (dto != null) { entity.setPermissions(permissions); entity.setStatus(status); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp index 3c7c3fba39..9b6b3d5500 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp @@ -38,7 +38,7 @@ Displaying  of 
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp index 3777ca64c1..1373a98476 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp @@ -26,7 +26,7 @@ Displaying  of 
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp index 22a1811b31..c79ef897d9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp @@ -27,7 +27,7 @@ id="total-processor-types">
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp index 88df206cf4..816b02a955 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp @@ -26,7 +26,7 @@ Displaying  of 
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp index 8650bb7f01..72244199cb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp @@ -56,10 +56,10 @@ -
+
-
+
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp index 392642c1e1..3874e24dba 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp @@ -23,7 +23,7 @@ Displaying  of 
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp index ade603a973..6312f69c02 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp @@ -37,7 +37,7 @@
- +   Clear search
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp index 19b1f67bfd..d55ecdb809 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp @@ -25,7 +25,7 @@ Displaying  of 
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css index cf3576e569..9c947d5c91 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css @@ -168,10 +168,6 @@ ul.links span.header-link-over { white-space: normal; } -input.filter-list { - color: #888; -} - .table-cell { overflow: hidden; white-space: nowrap; @@ -189,8 +185,22 @@ label { margin-bottom: 2px; } -input::placeholder { - color: #728e9b; /*base-color*/ +/* placeholder styles */ + +*::placeholder { + color: #728e9b; +} +*::-webkit-input-placeholder { + color: #728e9b; +} +*:-moz-placeholder { + color: #728e9b; +} +*::-moz-placeholder { + color: #728e9b; +} +*:-ms-input-placeholder { + color: #728e9b; } input[type=text], input[type=password], textarea { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css index d243f9f588..af29702b37 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css @@ -51,7 +51,7 @@ } #history-last-refreshed { - font-weight: bold; + font-weight: 500; } #history-header { @@ -87,6 +87,7 @@ #history-purge-button { float: right; + padding-left: 4px; } @@ -145,7 +146,7 @@ div.history-details-name { #history-table { position: absolute; - top: 62px; + top: 66px; left: 0px; bottom: 47px; right: 0px; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css index 6259c4f4b9..0124106b50 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css @@ -33,8 +33,14 @@ margin-bottom: 24px; } +#delete-policy-button { + margin-top: -4px; +} + #new-policy-user-button { + margin-top: -4px; margin-right: 5px; + padding-left: 5px; } button.policy-button { @@ -178,7 +184,8 @@ div.policy-selected-component-type { } #policy-last-refreshed { - font-weight: bold; + color: #775351; + font-weight: 500; } /* diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css index b1bfcb7522..b572ede4b3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css @@ -64,7 +64,8 @@ } #process-group-configuration-last-refreshed { - font-weight: bold; + color: #775351; + font-weight: 500; } /* general */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css index 3229c4c884..f65011d51f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css @@ -57,7 +57,7 @@ } #provenance-last-refreshed { - font-weight: bold; + font-weight: 500; } #provenance-header { @@ -75,10 +75,6 @@ div.provenance-panel { /* filter controls */ -#provenance-filter-controls { - float: right; -} - #provenance-filter-container { height: 24px; width: 100%; @@ -90,10 +86,6 @@ div.provenance-panel { float: left; } -input.provenance-filter-list { - color: #888; -} - #provenance-filter-type { float: left; } @@ -108,10 +100,9 @@ input.provenance-filter-list { /* provenance search controls */ #provenance-search-container { - float: right; - position: relative; + position: absolute; + right: 0; top: 38px; - height: 0px; } #provenance-search-button { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css index 304cafaaba..7af87c7802 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css @@ -113,10 +113,6 @@ div.settings-buttons div.button { float: left; } -#reporting-tasks-tab-content { - top: 32px; -} - -#controller-services-tab-content { +div.controller-settings-table { top: 32px; } \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css index 27d1869040..ac969c2880 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css @@ -42,7 +42,8 @@ } #status-history-last-refreshed { - font-weight: bold; + color:#775351; + font-weight:500; } #status-history-loading-container { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css index 0b85a5803c..5dd2210c62 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css @@ -57,7 +57,7 @@ } #templates-last-refreshed { - font-weight: bold; + font-weight: 500; } #templates-header { @@ -77,10 +77,6 @@ float: left; } -input.templates-filter-list { - color: #888; -} - #templates-filter-type { float: left; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css index 1810e50204..1cacd2bca7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css @@ -56,7 +56,8 @@ } #users-last-refreshed { - font-weight: bold; + color: #775351; + font-weight: 500; } #users-header { @@ -65,7 +66,7 @@ #new-user-button { float: right; - margin-top: 4px; + padding-left: 5px; } /* users table */ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css index 4797192648..4128e32621 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css @@ -45,7 +45,7 @@ div.add-property-text { div.property-table { position: absolute; - top: 43px; + top: 42px; bottom: 0px; left: 0px; right: 0px; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js index 88f6c22ce2..1f0c206599 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js @@ -58,9 +58,6 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { banners: '../nifi-api/flow/banners', about: '../nifi-api/flow/about', bulletinBoard: '../nifi-api/flow/bulletin-board' - }, - styles: { - filterList: 'bulletin-board-filter-list' } }; @@ -77,17 +74,6 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { $('#bulletin-board-container').empty(); }); - // define the function for filtering the list - $('#bulletin-board-filter').focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); - // filter type $('#bulletin-board-filter-type').combo({ options: [{ @@ -314,26 +300,23 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { var bulletinContainer = $('#bulletin-board-container'); // get the filter text - var filterField = $('#bulletin-board-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - var filter = filterField.val(); - if (filter !== '') { - // determine which field to filter on - var filterOption = $('#bulletin-board-filter-type').combo('getSelectedOption'); - data[filterOption.value] = filter; + var filter = $('#bulletin-board-filter').val(); + if (filter !== '') { + // determine which field to filter on + var filterOption = $('#bulletin-board-filter-type').combo('getSelectedOption'); + data[filterOption.value] = filter; - // append filtering message if necessary - if (filterText !== filter || filterType !== filterOption.text) { - var filterContent = $('
').text('Filter ' + filterOption.text + ' matching \'' + filter + '\''); - appendAndScroll(bulletinContainer, filterContent.get(0)); - filterText = filter; - filterType = filterOption.text; - } - } else if (filterText !== null) { - appendAndScroll(bulletinContainer, '
Filter removed
'); - filterText = null; - filterType = null; + // append filtering message if necessary + if (filterText !== filter || filterType !== filterOption.text) { + var filterContent = $('
').text('Filter ' + filterOption.text + ' matching \'' + filter + '\''); + appendAndScroll(bulletinContainer, filterContent.get(0)); + filterText = filter; + filterType = filterOption.text; } + } else if (filterText !== null) { + appendAndScroll(bulletinContainer, '
Filter removed
'); + filterText = null; + filterType = null; } return $.ajax({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js index 17e2882ab7..8bd7fcd983 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js @@ -59,9 +59,6 @@ nf.ng.Canvas.ToolboxCtrl = function (processorComponent, template: 'Template', label: 'Label' }, - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api', controller: '../nifi-api/controller', diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js index abd4402754..387bfd4785 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js @@ -160,12 +160,7 @@ nf.ng.ProcessorComponent = function (serviceProvider) { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#processor-type-filter'); - if (!filterField.hasClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#processor-type-filter').val(); }; /** @@ -176,7 +171,7 @@ nf.ng.ProcessorComponent = function (serviceProvider) { $('#processor-tag-cloud').tagcloud('clearSelectedTags'); // clear any filter strings - $('#processor-type-filter').addClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList); + $('#processor-type-filter').val(''); // reapply the filter applyFilter(); @@ -260,17 +255,6 @@ nf.ng.ProcessorComponent = function (serviceProvider) { * Initialize the filter. */ init: function () { - // define the function for filtering the list - $('#processor-type-filter').focus(function () { - if ($(this).hasClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList)) { - $(this).removeClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList); - } - }).addClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList); - // initialize the processor type table var processorTypesColumns = [ {id: 'type', name: 'Type', field: 'label', sortable: true, resizable: true}, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js index 781bb20c88..ae878f2e0f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js @@ -57,12 +57,10 @@ nf.Actions = (function () { dataType: 'json', contentType: 'application/json' }).fail(function (xhr, status, error) { - if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) { - nf.Dialog.showOkDialog({ - headerText: 'Update Resource', - dialogContent: nf.Common.escapeHtml(xhr.responseText) - }); - } + nf.Dialog.showOkDialog({ + headerText: 'Update Resource', + dialogContent: nf.Common.escapeHtml(xhr.responseText) + }); }); }; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js index ce659d7849..8be9afd189 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js @@ -22,13 +22,6 @@ */ nf.ComponentState = (function () { - var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - } - }; - /** * Filters the component state table. */ @@ -105,12 +98,7 @@ nf.ComponentState = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#component-state-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#component-state-filter').val(); }; /** @@ -195,7 +183,7 @@ nf.ComponentState = (function () { $('#component-state-description').text(''); // clear any filter strings - $('#component-state-filter').addClass(config.styles.filterList).val(config.filterText); + $('#component-state-filter').val(''); // reset clear link $('#clear-link').removeClass('disabled').attr('title', ''); @@ -210,17 +198,9 @@ nf.ComponentState = (function () { return { init: function () { // intialize the component state filter - $('#component-state-filter').on('focus', function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).on('blur', function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).on('keyup', function () { + $('#component-state-filter').on('keyup', function () { applyFilter(); - }).addClass(config.styles.filterList).val(config.filterText); + }); // initialize the processor configuration dialog $('#component-state-dialog').modal({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js index 22becbc3c4..46c2342593 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js @@ -23,10 +23,6 @@ nf.ControllerServices = (function () { var initialized = false; var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api', controllerServiceTypes: '../nifi-api/flow/controller-service-types' @@ -49,12 +45,7 @@ nf.ControllerServices = (function () { * accounts for that. */ var getControllerServiceTypeFilterText = function () { - var filterText = ''; - var filterField = $('#controller-service-type-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#controller-service-type-filter').val(); }; /** @@ -261,17 +252,6 @@ nf.ControllerServices = (function () { * Initializes the new controller service dialog. */ var initNewControllerServiceDialog = function () { - // define the function for filtering the list - $('#controller-service-type-filter').focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); - // initialize the processor type table var controllerServiceTypesColumns = [ {id: 'type', name: 'Type', field: 'label', sortable: false, resizable: true}, @@ -387,7 +367,7 @@ nf.ControllerServices = (function () { clearSelectedControllerService(); // clear any filter strings - $('#controller-service-type-filter').addClass(config.styles.filterList).val(config.filterText); + $('#controller-service-type-filter').val(''); // clear the tagcloud $('#controller-service-tag-cloud').tagcloud('clearSelectedTags'); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js index 7701950f1b..df0a4994df 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js @@ -20,10 +20,6 @@ nf.ProcessGroupConfiguration = (function () { var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api' } @@ -123,6 +119,9 @@ nf.ProcessGroupConfiguration = (function () { url: config.urls.api + '/process-groups/' + encodeURIComponent(groupId), dataType: 'json' }).done(function (response) { + // update the current time + $('#process-group-configuration-last-refreshed').text(response.currentTime); + if (response.permissions.canWrite) { var processGroup = response.component; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index f94368d1e5..713a2c2d1e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -20,10 +20,6 @@ nf.Settings = (function () { var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api', controllerConfig: '../nifi-api/controller/config', @@ -256,12 +252,7 @@ nf.Settings = (function () { * accounts for that. */ var getReportingTaskTypeFilterText = function () { - var filterText = ''; - var filterField = $('#reporting-task-type-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#reporting-task-type-filter').val(); }; /** @@ -419,15 +410,7 @@ nf.Settings = (function () { } else { applyReportingTaskTypeFilter(); } - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // initialize the processor type table var reportingTaskTypesColumns = [ @@ -574,7 +557,7 @@ nf.Settings = (function () { clearSelectedReportingTask(); // clear any filter strings - $('#reporting-task-type-filter').addClass(config.styles.filterList).val(config.filterText); + $('#reporting-task-type-filter').val(''); // clear the tagcloud $('#reporting-task-tag-cloud').tagcloud('clearSelectedTags'); @@ -1002,6 +985,7 @@ nf.Settings = (function () { } else { if (nf.Common.canModifyController()) { $('#new-service-or-task').show(); + $('div.controller-settings-table').css('top', '32px'); // update the tooltip on the button $('#new-service-or-task').attr('title', function () { @@ -1015,6 +999,7 @@ nf.Settings = (function () { }); } else { $('#new-service-or-task').hide(); + $('div.controller-settings-table').css('top', '0'); } // resize the table diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js index ff05e1f38e..e9a9e0e024 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js @@ -25,10 +25,6 @@ nf.ClusterTable = (function () { var config = { primaryNode: 'Primary Node', clusterCoorindator: 'Cluster Coordinator', - filterText: 'Filter', - styles: { - filterList: 'cluster-filter-list' - }, urls: { cluster: '../nifi-api/controller/cluster', nodes: '../nifi-api/controller/cluster/nodes' @@ -244,12 +240,7 @@ nf.ClusterTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#cluster-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#cluster-filter').val(); }; /** @@ -365,15 +356,7 @@ nf.ClusterTable = (function () { // define the function for filtering the list $('#cluster-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter type $('#cluster-filter-type').combo({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js index 81854ee895..22bf350037 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js @@ -23,9 +23,6 @@ nf.CountersTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - styles: { - filterList: 'counters-filter-list' - }, urls: { counters: '../nifi-api/counters' } @@ -61,12 +58,7 @@ nf.CountersTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#counters-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#counters-filter').val(); }; /** @@ -141,15 +133,7 @@ nf.CountersTable = (function () { // define the function for filtering the list $('#counters-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); + }); // filter type $('#counters-filter-type').combo({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js index 299c6223fa..ab1e9e65a7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js @@ -25,9 +25,7 @@ nf.HistoryTable = (function () { var config = { defaultStartTime: '00:00:00', defaultEndTime: '23:59:59', - filterText: 'Filter', styles: { - filterList: 'filter-list', hidden: 'hidden' }, urls: { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js index d80d625184..09d25e5142 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js @@ -28,7 +28,6 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { defaultStartTime: '00:00:00', defaultEndTime: '23:59:59', styles: { - filterList: 'provenance-filter-list', hidden: 'hidden' }, urls: { @@ -518,15 +517,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { // define the function for filtering the list $('#provenance-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); + }); // filter options var filterOptions = [{ @@ -796,12 +787,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#provenance-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#provenance-filter').val(); }; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js index 145ae1f051..2dc31c2be2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js @@ -22,9 +22,6 @@ nf.SummaryTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - styles: { - filterList: 'summary-filter-list' - }, urls: { api: '../nifi-api', status: '../nifi-api/flow/process-groups/root/status', @@ -59,15 +56,7 @@ nf.SummaryTable = (function () { // define the function for filtering the list $('#summary-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); + }); // initialize the summary tabs $('#summary-tabs').tabbs({ @@ -236,7 +225,7 @@ nf.SummaryTable = (function () { } // reset the filter - $('#summary-filter').addClass(config.styles.filterList); + $('#summary-filter').val(''); applyFilter(); } }); @@ -2299,12 +2288,7 @@ nf.SummaryTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#summary-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#summary-filter').val(); }; /** diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js index 6afba5e0d9..627bc05995 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js @@ -23,10 +23,6 @@ nf.TemplatesTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - filterText: 'Filter', - styles: { - filterList: 'templates-filter-list' - }, urls: { templates: '../nifi-api/flow/templates', downloadToken: '../nifi-api/access/download-token' @@ -126,12 +122,7 @@ nf.TemplatesTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#templates-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#templates-filter').val(); }; /** @@ -214,15 +205,7 @@ nf.TemplatesTable = (function () { // define the function for filtering the list $('#templates-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter type $('#templates-filter-type').combo({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js index b6a73f7c99..96efd73820 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js @@ -23,10 +23,6 @@ nf.UsersTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - filterText: 'Filter', - styles: { - filterList: 'users-filter-list' - }, urls: { users: '../nifi-api/tenants/users', userGroups: '../nifi-api/tenants/user-groups' @@ -480,15 +476,7 @@ nf.UsersTable = (function () { // define the function for filtering the list $('#users-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter type $('#users-filter-type').combo({ @@ -654,12 +642,7 @@ nf.UsersTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#users-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#users-filter').val(); }; /**