diff --git a/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue b/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue index 141249b70..19ca3480c 100644 --- a/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue +++ b/resources/assets/js/components/dataViews/vueCardView/VueCardView.vue @@ -33,7 +33,7 @@
@@ -51,6 +51,7 @@ export default { props: ["options"], data() { return { + loadMore: this.$t("ID_LOAD_MORE") }; }, mounted() { diff --git a/resources/assets/js/components/dataViews/vueCardView/VueCardViewMixins.js b/resources/assets/js/components/dataViews/vueCardView/VueCardViewMixins.js index d7604a7ce..77a224d00 100644 --- a/resources/assets/js/components/dataViews/vueCardView/VueCardViewMixins.js +++ b/resources/assets/js/components/dataViews/vueCardView/VueCardViewMixins.js @@ -39,6 +39,8 @@ export default { if (data.data && data.data.length != 0) { that.data = that.data.concat(data.data); that.config.page += 1; + } else { + that.loadMore = that.$t("ID_NO_MORE_INFORMATION"); } }) .catch(() => { diff --git a/resources/assets/js/components/dataViews/vueListView/VueListView.vue b/resources/assets/js/components/dataViews/vueListView/VueListView.vue index 872077c9c..a5c4a2010 100644 --- a/resources/assets/js/components/dataViews/vueListView/VueListView.vue +++ b/resources/assets/js/components/dataViews/vueListView/VueListView.vue @@ -36,7 +36,7 @@ @@ -54,6 +54,7 @@ export default { props: ["options"], data() { return { + loadMore: this.$t("ID_LOAD_MORE") }; }, mounted() { diff --git a/resources/assets/js/components/dataViews/vueListView/VueListViewMixins.js b/resources/assets/js/components/dataViews/vueListView/VueListViewMixins.js index ee26a8354..d322cef9c 100644 --- a/resources/assets/js/components/dataViews/vueListView/VueListViewMixins.js +++ b/resources/assets/js/components/dataViews/vueListView/VueListViewMixins.js @@ -39,6 +39,8 @@ export default { if (data.data && data.data.length != 0) { that.data = that.data.concat(data.data); that.config.page += 1; + } else { + that.loadMore = that.$t("ID_NO_MORE_INFORMATION"); } }) .catch(() => { diff --git a/workflow/engine/content/translations/english/processmaker.en.po b/workflow/engine/content/translations/english/processmaker.en.po index 62c237484..2b954b09a 100755 --- a/workflow/engine/content/translations/english/processmaker.en.po +++ b/workflow/engine/content/translations/english/processmaker.en.po @@ -3545,12 +3545,6 @@ msgstr "The Case was deleted successfully." msgid "Case Uid" msgstr "Case Uid" -# TRANSLATION -# LABEL/ID_CASE_THREAD_TITLE -#: LABEL/ID_CASE_THREAD_TITLE -msgid "Case Thread Title" -msgstr "Case Thread Title" - # TRANSLATION # LABEL/ID_CASES #: LABEL/ID_CASES @@ -53125,4 +53119,10 @@ msgstr "Risk Matrix per Process by Task Status" # LABEL/ID_TOP #: LABEL/ID_TOP msgid "Top" -msgstr "Top" \ No newline at end of file +msgstr "Top" + +# TRANSLATION +# LABEL/ID_NO_MORE_INFORMATION +#: LABEL/ID_NO_MORE_INFORMATION +msgid "No more Information to Load" +msgstr "No more Information to Load" \ No newline at end of file diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index 1d841081f..44fe1cc6f 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -60345,6 +60345,7 @@ INSERT INTO TRANSLATION (TRN_CATEGORY,TRN_ID,TRN_LANG,TRN_VALUE,TRN_UPDATE_DATE ( 'LABEL','ID_NO_MANAGER_SELECTED','en','No Manager Selected','2014-01-15') , ( 'LABEL','ID_NO_MATCHING_RECORDS','en','No matching records','2020-12-10') , ( 'LABEL','ID_NO_MORE_APPLICATIONS','en','No more applications to show.','2014-01-15') , +( 'LABEL','ID_NO_MORE_INFORMATION','en','No more information to Load','2020-08-31') , ( 'LABEL','ID_NO_NEW_VERSIONS','en','No new versions available','2014-09-18') , ( 'LABEL','ID_NO_OLDER_SESSION_FILES','en','There are no older session files','2014-01-15') , ( 'LABEL','ID_NO_PERMISSION_NO_PARTICIPATED','en','You cannot open this case because on the reason below: