diff --git a/.production/gulpfile.js b/.production/gulpfile.js index c7f55faca..394cb8760 100644 --- a/.production/gulpfile.js +++ b/.production/gulpfile.js @@ -69,6 +69,7 @@ gulp.task('xjsp', () => { if (file.includes('.development.js')) file = file.replace('.development.js', '.production.min.js') return '' } else { + if (file.includes('/js/feeds.jsx')) file = file.replace('/js/feeds.jsx', '') file = file.replace('.jsx', '.js').split('?')[0] console.log(p + ' >> ' + file) file += '?v=' + fileHex(file) diff --git a/src/main/java/com/rebuild/web/base/general/GeneralDataListControll.java b/src/main/java/com/rebuild/web/base/general/GeneralDataListControll.java index 690596833..470fdfdc0 100644 --- a/src/main/java/com/rebuild/web/base/general/GeneralDataListControll.java +++ b/src/main/java/com/rebuild/web/base/general/GeneralDataListControll.java @@ -108,7 +108,7 @@ public class GeneralDataListControll extends BaseEntityControll { if (MetadataHelper.containsEntity(id.getEntityCode())) { Entity entity = MetadataHelper.getEntity(id.getEntityCode()); if (MetadataHelper.hasPrivilegesField(entity)) { - url = MessageFormat.format("{0}/list#!/View/{0}/{1}", entity, id); + url = MessageFormat.format("{0}/list#!/View/{0}/{1}", entity.getName(), id); } else if (entity.getEntityCode() == EntityHelper.Feeds) { url = "../feeds/home#gs=" + id; }