Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix/4.2.2 #814

Merged
merged 1 commit into from
Jan 15, 2024
Merged

Hotfix/4.2.2 #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
profileHubVersion=4.2.1
profileHubVersion=4.2.2-SNAPSHOT
grailsVersion=5.2.4
grailsGradlePluginVersion=5.2.3
groovyVersion=3.0.11
Expand Down
9 changes: 9 additions & 0 deletions grails-app/assets/javascripts/profileEditor/templates/imageMetadata.tpl.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,15 @@ <h4 class="modal-title">Image details</h4>
<span>{{ imageMetadataCtrl.image.metadata.licence }}</span>
</div>
</div>

<div class= "row margin-bottom-1" ng-show="imageMetadataCtrl.image.metadata.originalFileName">
<div class="col-sm-3">
<span class="output-label">File Name</span>
</div>
<div class="col-sm-9">
<span>{{ imageMetadataCtrl.image.metadata.originalFileName }}</span>
</div>
</div>
</div>

<div class="modal-footer">
Expand Down
9 changes: 9 additions & 0 deletions grails-app/assets/javascripts/profileEditor/templates/imageUpload.tpl.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
<div class="form-horizontal">
<div class="form-horizontal" ng-if="metadata.originalFileName">
<div class="form-group">
<label for="licence" class="col-sm-3" style="text-align: right">Current Image</label>

<div class="col-sm-9">
<span>{{ metadata.originalFileName }}</span>
</div>
</div>
</div>
<div class="form-group" ng-hide="disableSource">
<label class="col-sm-3 control-label">Upload source</label>
<div class="col-sm-9">
Expand Down
4 changes: 2 additions & 2 deletions grails-app/views/profile/_images.gsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
ng-show="!image.excluded">
<div class="imgCon ">
<a href="" ng-click="imageCtrl.showMetadata(image)" target="_blank"
ng-if="image.thumbnailUrl" title="View details">
ng-if="image.thumbnailUrl" title="{{image.metadata.originalFileName}}">
<img ng-src="{{image.thumbnailUrl}}"
ng-if="image.thumbnailUrl && image.type.name == 'OPEN'"
class="thumbnail"/>
Expand Down Expand Up @@ -100,7 +100,7 @@
<div class="col-sm-4">
<div class="imgCon">
<a href="" ng-click="imageCtrl.showMetadata(image)" target="_blank"
ng-if="image.largeImageUrl" title="View details">
ng-if="image.largeImageUrl" title="{{image.metadata.originalFileName}}">
<img ng-src="{{image.largeImageUrl}}"
ng-if="image.largeImageUrl && image.type.name == 'OPEN'"
class="thumbnail"/>
Expand Down
Loading