fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/PMCORE-3263 (pull request #8090)

Browse Source 
Feature/PMCORE-3263

Approved-by: Rodrigo Quelca
This commit is contained in:
Henry Jonathan Quispe Quispe
2021-08-31 21:28:28 +00:00
committed by Rodrigo Quelca
parent c914e611ec 75f02218a4
commit fa8940382c
6 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/assets/js/components/dataViews/vueCardView/VueCardView.vue
View File

@@ -33,7 +33,7 @@
</div>
<div class="pm-vue-card-view-footer">
<a @click="viewMore" class="list-group-item">View more</a>
<a @click="viewMore" class="list-group-item">{{loadMore}}</a>
</div>
</div>
</div>
@@ -51,6 +51,7 @@ export default {
props: ["options"],
data() {
return {
loadMore: this.$t("ID_LOAD_MORE")
};
},
mounted() {

2
resources/assets/js/components/dataViews/vueCardView/VueCardViewMixins.js
View File

@@ -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(() => {

3
resources/assets/js/components/dataViews/vueListView/VueListView.vue
View File

@@ -36,7 +36,7 @@
</div>
<div class="pm-vue-list-view-footer">
<a @click="viewMore" class="list-group-item">View more</a>
<a @click="viewMore" class="list-group-item">{{ loadMore }}</a>
</div>
</div>
</div>
@@ -54,6 +54,7 @@ export default {
props: ["options"],
data() {
return {
loadMore: this.$t("ID_LOAD_MORE")
};
},
mounted() {

2
resources/assets/js/components/dataViews/vueListView/VueListViewMixins.js
View File

@@ -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(() => {

20
workflow/engine/content/translations/english/processmaker.en.po
View File

@@ -3557,12 +3557,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
@@ -53173,4 +53167,16 @@ msgstr "Risk Matrix per Process by Task Status"
# LABEL/ID_TOP
#: LABEL/ID_TOP
msgid "Top"
msgstr "Top"
msgstr "Top"
# TRANSLATION
# LABEL/ID_CASE_THREAD_TITLE
#: LABEL/ID_CASE_THREAD_TITLE
msgid "Case Thread Title"
msgstr "Case Thread Title"
# TRANSLATION
# LABEL/ID_NO_MORE_INFORMATION
#: LABEL/ID_NO_MORE_INFORMATION
msgid "No more Information to Load"
msgstr "No more Information to Load"

1
workflow/engine/data/mysql/insert.sql
View File

@@ -60348,6 +60348,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: <br> You do not have permission to see this case. <br> You have not participated in this case. <br> Case is already claimed.','2017-06-05') ,