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

Issue 29238 attaching files feature on tasks. UI fix #30158

Merged
merged 11 commits into from
Oct 1, 2024
Merged

Issue 29238 attaching files feature on tasks. UI fix #30158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
93185ec
fix: aded functionality to transform the dot assets to file assets re…
gortiz-dotcms Sep 12, 2024
8075004
chore: modified access to system user to avoid changing the method pa…
gortiz-dotcms Sep 13, 2024
053558c
test: added test (#29238)
gortiz-dotcms Sep 13, 2024
c602df1
Merge branch 'master' into issue-29238-Attaching-files-feature-on-tasks
gortiz-dotcms Sep 18, 2024
a076666
refactor: added a null check (#29238)
gortiz-dotcms Sep 19, 2024
08ece1a
Merge branch 'issue-29238-Attaching-files-feature-on-tasks' of https:…
gortiz-dotcms Sep 19, 2024
c5d82f6
chore: modify exceptions (#29238)
gortiz-dotcms Sep 20, 2024
d7ae2e4
fix: fixed ui and src (#29238)
gortiz-dotcms Sep 26, 2024
281c53e
merge master into issue 29238
gortiz-dotcms Sep 26, 2024
393bc6c
fix: fixed sonarqube warn
gortiz-dotcms Sep 26, 2024
d8202d6
Merge branch 'master' into issue-29238-Attaching-files-feature-on-tasks
gortiz-dotcms Sep 27, 2024
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
5 changes: 4 additions & 1 deletion dotCMS/src/main/java/com/dotmarketing/portlets/contentlet/model/ResourceLink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,10 @@ boolean isDownloadPermissionBasedRestricted(final Contentlet contentlet, final U
public String getFileLink(final HttpServletRequest request, final User user, final Contentlet contentlet, final String field) throws DotDataException, DotSecurityException {

ResourceLink link = this.build(request, user, contentlet, field);
final Host host = getHost(contentlet.getHost(), user);
Host host = getHost((String)request.getAttribute(HOST_REQUEST_ATTRIBUTE) , user);
if(null == host){
host = getHost(contentlet.getHost(), user);
}

final StringBuilder hostUrlBuilder = new StringBuilder(request.isSecure()? HTTPS_PREFIX:HTTP_PREFIX);

Expand Down
9 changes: 5 additions & 4 deletions dotCMS/src/main/java/com/dotmarketing/portlets/fileassets/business/FileAssetAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,8 @@ private FileAsset transformDotAsset(Contentlet con) {

final HttpServletRequest request = HttpServletRequestThreadLocal.INSTANCE.getRequest();
if (request != null) {
final String fileLink = new ResourceLink.ResourceLinkBuilder().getFileLink(request, APILocator.systemUser(), fileAsset, "fileAsset");
final String fileLink = new ResourceLink.ResourceLinkBuilder().build(request, APILocator.systemUser(), fileAsset, FileAssetAPI.BINARY_FIELD).getConfiguredImageURL();


fileAsset.getMap().put("fileLink", fileLink);
}
Expand Down Expand Up @@ -479,7 +480,7 @@ private String getRelativeAssetPath(String inode, String fileName) {
String path = "";

path = java.io.File.separator + _inode.charAt(0)
+ java.io.File.separator + _inode.charAt(1) + java.io.File.separator + _inode + java.io.File.separator + "fileAsset" + java.io.File.separator+ fileName;
+ java.io.File.separator + _inode.charAt(1) + java.io.File.separator + _inode + java.io.File.separator + FileAssetAPI.BINARY_FIELD + java.io.File.separator+ fileName;

return path;

Expand Down Expand Up @@ -620,7 +621,7 @@ public String getRealAssetPath(final String inode, final String fileName, final
final String fullFileName = UtilMethods.isSet(ext) ? fileName + "." + ext : fileName;
final String path = ((!UtilMethods.isSet(realPath)) ? assetPath : realPath)
+ inode.charAt(0) + java.io.File.separator + inode.charAt(1)
+ java.io.File.separator + inode+ java.io.File.separator + "fileAsset" + java.io.File.separator + fullFileName;
+ java.io.File.separator + inode+ java.io.File.separator + FileAssetAPI.BINARY_FIELD + java.io.File.separator + fullFileName;

if (!UtilMethods.isSet(realPath)) {
return FileUtil.getRealPath(path);
Expand Down Expand Up @@ -680,7 +681,7 @@ public String getRealAssetPath(String inode) {

path = ((!UtilMethods.isSet(realPath)) ? assetPath : realPath)
+ _inode.charAt(0) + java.io.File.separator + _inode.charAt(1)
+ java.io.File.separator + _inode+ java.io.File.separator + "fileAsset" + java.io.File.separator;
+ java.io.File.separator + _inode+ java.io.File.separator + FileAssetAPI.BINARY_FIELD + java.io.File.separator;

if (!UtilMethods.isSet(realPath))
return FileUtil.getRealPath(path);
Expand Down
9 changes: 6 additions & 3 deletions dotCMS/src/main/webapp/html/portlet/ext/workflows/view_workflow_task.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,14 @@ public String getGravatar(String postedBy){
}
%>
<tr <%=str_style %>>
<a href="<%= (fileAsset != null && fileAsset.getMap().get("fileLink") != null) ? fileAsset.getMap().get("fileLink") : file.getURI() %>" target="_blank">
<%= (fileAsset != null && fileAsset.getMap().get("fileLink") != null) ? fileAsset.getUnderlyingFileName() : file.getFileName() %>
</a>

<td>
<a href="<%= (fileAsset != null && fileAsset.getMap().get("fileLink") != null) ? fileAsset.getMap().get("fileLink") : file.getURI() %>" target="_blank">
<%= (fileAsset != null && fileAsset.getMap().get("fileLink") != null) ? fileAsset.getUnderlyingFileName() : file.getFileName() %>
</a>
</td>
<td>

<button dojoType="dijit.form.Button" type="button" class="dijitButtonDanger" style="float: right;" onClick="removeFile('<%= file.getInode() %>')"><%= LanguageUtil.get(pageContext, "remove") %></button>
</td>
</tr>
Expand Down