Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

[ADF-3289] AppsDefinitionApi contains two methods with same name and different firms #347

Merged
merged 3 commits into from
Jun 29, 2018
Merged

[ADF-3289] AppsDefinitionApi contains two methods with same name and different firms #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b68fcb5
remove duplicate methods firms
eromano Jun 28, 2018
f43aafb
changelog
eromano Jun 28, 2018
89ea8a7
fix travis pipeline
eromano Jun 29, 2018
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@

# Alfresco JS API

<a name="2.5.0"></a>
# [2.5.0](https://github.com/Alfresco/alfresco-js-api/releases/tag/2.4.0) (xx-xx-2018)

## Features

## Fixes
[AppsDefinitionApi contains two methods with same name and different firms](https://issues.alfresco.com/jira/browse/ADF-3289)


<a name="2.4.0"></a>
# [2.4.0](https://github.com/Alfresco/alfresco-js-api/releases/tag/2.4.0) (25-06-2018)

Expand Down
4 changes: 3 additions & 1 deletion index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2527,6 +2527,8 @@ declare namespace AlfrescoApi {

importAppDefinition(file?: File): Promise<AppDefinitionRepresentation>;

importNewAppDefinition(modelId?: number, file?: File): Promise<AppDefinitionRepresentation>;

publishAppDefinition(modelId?: number, publishModel?: AppDefinitionPublishRepresentation): Promise<AppDefinitionUpdateResultRepresentation>;
}

Expand All @@ -2553,7 +2555,7 @@ declare namespace AlfrescoApi {

importAppDefinition(file?: File): Promise<AppDefinitionRepresentation>;

importAppDefinition(modelId?: number, file?: File): Promise<AppDefinitionRepresentation>;
importNewAppDefinition(modelId?: number, file?: File): Promise<AppDefinitionRepresentation>;

publishAppDefinition(modelId?: number, publishModel?: AppDefinitionPublishRepresentation): Promise<AppDefinitionUpdateResultRepresentation>;
}
Expand Down
2 changes: 1 addition & 1 deletion scripts/test-demo-shell-adf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rm -rf $TEMP_ADF_DIR;
echo "====== CLONE ADF ====="

git clone https://$TOKEN@github.com/Alfresco/alfresco-ng2-components.git $TEMP_ADF_DIR
cd $TEMP_ADF_DIR/demo-shell/
cd $TEMP_ADF_DIR/
git checkout master

echo "====== INSTALL Demo Shell ====="
Expand Down
2 changes: 1 addition & 1 deletion src/alfresco-activiti-rest-api/src/api/AppsApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
* @param {File} file file
* data is of type: {module:model/AppDefinitionRepresentation}
*/
this.importAppDefinition = function(modelId, file) {
this.importNewAppDefinition = function(modelId, file) {
var postBody = null;

// verify the required parameter 'modelId' is set
Expand Down
2 changes: 1 addition & 1 deletion src/alfresco-activiti-rest-api/src/api/AppsDefinitionApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
* @param {File} file file
* data is of type: {module:model/AppDefinitionRepresentation}
*/
this.importAppDefinition = function(modelId, file) {
this.importNewAppDefinition = function(modelId, file) {
var postBody = null;

// verify the required parameter 'modelId' is set
Expand Down
2 changes: 1 addition & 1 deletion src/alfresco-core-rest-api/src/ApiClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
*/
exports.prototype.isFileParam = function(param) {
// fs.ReadStream in Node.js (but not in runtime like browserify)
if(typeof require('fs').ReadStream === 'object') {
if(typeof require('fs').ReadStream) {
if (typeof window === 'undefined' &&
typeof require === 'function' &&
require('fs') &&
Expand Down