Branch: refs/heads/release/jon3.2.x Home: https://github.com/rhq-project/rhq Commit: 682a46c730b146598c88141d6cd24eb0dad462d1 https://github.com/rhq-project/rhq/commit/682a46c730b146598c88141d6cd24eb... Author: Lukas Krejci <lkrejci(a)redhat.com&gt; Date: 2014-06-25 (Wed, 25 Jun 2014) Changed paths: M modules/enterprise/gui/portal-war/src/main/webapp/rhq/common/fileUpload.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/contentProvider-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/importRepos-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listContentProviders-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/listRepos-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repo-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoAssociations-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/content/repoSubscriptions-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/confirm-create-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/history-request-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/installed_package_details-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/subscription_packages-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/content/update-plain.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/include/pagination.xhtml M modules/enterprise/gui/portal-war/src/main/webapp/rhq/resource/monitor/schedules-plain.xhtml Log Message: ----------- [BZ 1081592] - Attempt to deploy a package to the resource from the repository gives error This is a combination of 2 commits that were squashed toghether: * [BZ 1099485] Fix JSF file upload popup for all upload locations (cherry picked from commit 76f9e174ed62be4742f35a91bd3e9aa02934a81e) Signed-off-by: Jirka Kremser <jkremser(a)redhat.com&gt; * [BZ 1078510] - Make sure to use the "plain" pagination on "plain" jsf pages This avoids the warning arising from the "non-plain" pagination trying to access page elements not present on the plain pages. (cherry picked from commit 3150c41379c2530a4ab50fd216fa891c0d78553d) Signed-off-by: Jirka Kremser <jkremser(a)redhat.com&gt;