getrebuild/rebuild
1
1
Fork 0
mirror of https://github.com/getrebuild/rebuild.git synced 2025-02-25 14:54:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #84 from getrebuild/filemrg-519

Browse source 
Quick fixs
This commit is contained in:
RB 2019-11-11 10:59:24 -06:00 committed by GitHub
commit 3dd2c188c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.production/gulpfile.js
View file

@ -69,6 +69,7 @@ gulp.task('xjsp', () => {
if (file.includes('.development.js')) file = file.replace('.development.js', '.production.min.js') if (file.includes('.development.js')) file = file.replace('.development.js', '.production.min.js')
return '<script src="' + file + '"></script>' return '<script src="' + file + '"></script>'
} else { } else {
if (file.includes('/js/feeds.jsx')) file = file.replace('/js/feeds.jsx', '')
file = file.replace('.jsx', '.js').split('?')[0] file = file.replace('.jsx', '.js').split('?')[0]
console.log(p + ' >> ' + file) console.log(p + ' >> ' + file)
file += '?v=' + fileHex(file) file += '?v=' + fileHex(file)

2
src/main/java/com/rebuild/web/base/general/GeneralDataListControll.java
View file

@ -108,7 +108,7 @@ public class GeneralDataListControll extends BaseEntityControll {
if (MetadataHelper.containsEntity(id.getEntityCode())) { if (MetadataHelper.containsEntity(id.getEntityCode())) {
Entity entity = MetadataHelper.getEntity(id.getEntityCode()); Entity entity = MetadataHelper.getEntity(id.getEntityCode());
if (MetadataHelper.hasPrivilegesField(entity)) { 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) { } else if (entity.getEntityCode() == EntityHelper.Feeds) {
url = "../feeds/home#gs=" + id; url = "../feeds/home#gs=" + id;
} }