You've already forked OpenIntegrations
mirror of
https://github.com/Bayselonarrend/OpenIntegrations.git
synced 2025-11-25 22:12:29 +02:00
Main build (Jenkins)
This commit is contained in:
7
docs/en/data/Bitrix24/MakeFileCopy.json
vendored
7
docs/en/data/Bitrix24/MakeFileCopy.json
vendored
@@ -1,6 +1 @@
|
||||
{
|
||||
"FolderID": "5016",
|
||||
"FileID": "5010",
|
||||
"URL": "b24-ar17wx.bitrix24.by",
|
||||
"Token": "fe3fa966006e9f06006b12e400000001000..."
|
||||
}
|
||||
{"FolderID":"5016","FileID":"5010","URL":"b24-ar17wx.bitrix24.by","Token":"fe3fa966006e9f06006b12e400000001000..."}
|
||||
12
docs/en/examples/Bitrix24/MakeFileCopy.txt
vendored
12
docs/en/examples/Bitrix24/MakeFileCopy.txt
vendored
@@ -1,15 +1,13 @@
|
||||
FolderID = "5014";
|
||||
FileID = "5010";
|
||||
FolderID = "40710";
|
||||
FileID = "40706";
|
||||
|
||||
URL = "https://b24-ar17wx.bitrix24.by/rest/1/f2ppp8uucc891111/";
|
||||
URL = "https://b24-ar17wx.bitrix24.by/rest/1/h0m...";
|
||||
|
||||
Result = OPI_Bitrix24.MakeFileCopy(URL, FileID, FolderID);
|
||||
|
||||
FolderID = "5016";
|
||||
FolderID = "40712";
|
||||
|
||||
URL = "b24-ar17wx.bitrix24.by";
|
||||
Token = "fe3fa966006e9f06006b12e400000001000...";
|
||||
Token = "4f8db968006e9f06006b12e400000001000...";
|
||||
|
||||
Result = OPI_Bitrix24.MakeFileCopy(URL, FileID, FolderID, Token);
|
||||
|
||||
Check_BitrixObject(Result);
|
||||
|
||||
@@ -12,7 +12,7 @@ import TabItem from '@theme/TabItem';
|
||||
|
||||
|
||||
|
||||
`Function MakeCopyFile(Val URL, Val FileID, Val FolderID, Val Token = "") Export`
|
||||
`Function MakeFileCopy(Val URL, Val FileID, Val FolderID, Val Token = "") Export`
|
||||
|
||||
| Parameter | CLI option | Type | Required | Description |
|
||||
|-|-|-|-|-|
|
||||
@@ -39,71 +39,49 @@ Method at API documentation: [disk.file.copyto](https://dev.1c-bitrix.ru/rest_he
|
||||
|
||||
URL = "https://b24-ar17wx.bitrix24.by/rest/1/h0m...";
|
||||
|
||||
Result = OPI_Bitrix24.MakeCopyFile(URL, FileID, FolderID);
|
||||
Result = OPI_Bitrix24.MakeFileCopy(URL, FileID, FolderID);
|
||||
|
||||
FolderID = "40712";
|
||||
|
||||
URL = "b24-ar17wx.bitrix24.by";
|
||||
Token = "4f8db968006e9f06006b12e400000001000...";
|
||||
|
||||
Result = OPI_Bitrix24.MakeCopyFile(URL, FileID, FolderID, Token);
|
||||
Result = OPI_Bitrix24.MakeFileCopy(URL, FileID, FolderID, Token);
|
||||
```
|
||||
|
||||
|
||||
<Tabs>
|
||||
|
||||
<TabItem value="bash" label="Bash" default>
|
||||
```bash
|
||||
oint bitrix24 MakeCopyFile \
|
||||
--url "b24-ar17wx.bitrix24.by" \
|
||||
--fileid 39110 \
|
||||
--folderid 39116 \
|
||||
--token "***"
|
||||
```
|
||||
</TabItem>
|
||||
|
||||
<TabItem value="bat" label="CMD/Bat" default>
|
||||
```batch
|
||||
oint bitrix24 MakeCopyFile ^
|
||||
--url "b24-ar17wx.bitrix24.by" ^
|
||||
--fileid 39110 ^
|
||||
--folderid 39116 ^
|
||||
--token "***"
|
||||
```
|
||||
</TabItem>
|
||||
</Tabs>
|
||||
|
||||
|
||||
```json title="Result"
|
||||
{
|
||||
"result": {
|
||||
"ID": 12604,
|
||||
"ID": 1744,
|
||||
"NAME": "New file name.jpg",
|
||||
"CODE": null,
|
||||
"STORAGE_ID": "3",
|
||||
"TYPE": "file",
|
||||
"PARENT_ID": "12582",
|
||||
"PARENT_ID": "1722",
|
||||
"DELETED_TYPE": 0,
|
||||
"GLOBAL_CONTENT_VERSION": 1,
|
||||
"FILE_ID": 8678,
|
||||
"FILE_ID": 1146,
|
||||
"SIZE": "805189",
|
||||
"CREATE_TIME": "2024-10-09T09:20:28+03:00",
|
||||
"UPDATE_TIME": "2024-10-09T09:20:28+03:00",
|
||||
"CREATE_TIME": "2024-07-03T14:42:54+00:00",
|
||||
"UPDATE_TIME": "2024-07-03T14:42:54+00:00",
|
||||
"DELETE_TIME": null,
|
||||
"CREATED_BY": "1",
|
||||
"UPDATED_BY": "1",
|
||||
"DELETED_BY": null,
|
||||
"DOWNLOAD_URL": "https://b24-ar17wx.bitrix24.by/rest/download.json?auth=6b2e0667006e9f06006b12e4000000010000072c4914d2a629a27f8e468fd6a8ba64ff&token=disk%7CaWQ9MTI2MDQmXz1ka3Jhc2tOdTFzMTNFR2lWMkxlRXhVaGhpRXNZNHJIeg%3D%3D%7CImRvd25sb2FkfGRpc2t8YVdROU1USTJNRFFtWHoxa2EzSmhjMnRPZFRGek1UTkZSMmxXTWt4bFJYaFZhR2hwUlhOWk5ISkllZz09fDZiMmUwNjY3MDA2ZTlmMDYwMDZiMTJlNDAwMDAwMDAxMDAwMDA3MmM0OTE0ZDJhNjI5YTI3ZjhlNDY4ZmQ2YThiYTY0ZmYi.N%2FF9rbooZHbXWXkg%2FNRXmmAOWkTJnKmwua3QXnjg12Y%3D",
|
||||
"DOWNLOAD_URL": "https://b24-ar17wx.bitrix24.by/rest/download.json?auth=fe708566006e9f06006b12e4000000010000076fcba303ea853529aed2cefade1444b3&token=disk%7CaWQ9MTc0NCZfPWphdFBTRXpUdHI2anZKbDNxMDBwVTdRRVZ4aDdGVTMy%7CImRvd25sb2FkfGRpc2t8YVdROU1UYzBOQ1pmUFdwaGRGQlRSWHBVZEhJMmFuWktiRE54TURCd1ZUZFJSVlo0YURkR1ZUTXl8ZmU3MDg1NjYwMDZlOWYwNjAwNmIxMmU0MDAwMDAwMDEwMDAwMDc2ZmNiYTMwM2VhODUzNTI5YWVkMmNlZmFkZTE0NDRiMyI%3D.uOKd1v3hEnu7vsep0NhRk3RzXtyT21DBrrwPl3DxLG8%3D",
|
||||
"DETAIL_URL": "https://b24-ar17wx.bitrix24.by/docs/file/New catalog/New file name.jpg"
|
||||
},
|
||||
"time": {
|
||||
"start": 1728454828.44084,
|
||||
"finish": 1728454828.53669,
|
||||
"duration": 0.0958428382873535,
|
||||
"processing": 0.0711829662322998,
|
||||
"date_start": "2024-10-09T09:20:28+03:00",
|
||||
"date_finish": "2024-10-09T09:20:28+03:00",
|
||||
"operating_reset_at": 1728455428,
|
||||
"start": 1720017774.37632,
|
||||
"finish": 1720017774.44715,
|
||||
"duration": 0.07082200050354,
|
||||
"processing": 0.0407531261444092,
|
||||
"date_start": "2024-07-03T14:42:54+00:00",
|
||||
"date_finish": "2024-07-03T14:42:54+00:00",
|
||||
"operating_reset_at": 1720018374,
|
||||
"operating": 0
|
||||
}
|
||||
}
|
||||
17956
service/dictionaries/en.json
vendored
17956
service/dictionaries/en.json
vendored
File diff suppressed because it is too large
Load Diff
4
src/en/OInt/core/Modules/OPI_Bitrix24.os
vendored
4
src/en/OInt/core/Modules/OPI_Bitrix24.os
vendored
@@ -2781,7 +2781,7 @@ EndFunction
|
||||
//
|
||||
// Returns:
|
||||
// Map Of KeyAndValue - serialized JSON of answer from Bitrix24 API
|
||||
Function MakeCopyFile(Val URL, Val FileID, Val FolderID, Val Token = "") Export
|
||||
Function MakeFileCopy(Val URL, Val FileID, Val FolderID, Val Token = "") Export
|
||||
|
||||
Parameters = NormalizeAuth(URL, Token, "disk.file.copyto");
|
||||
|
||||
@@ -5630,7 +5630,7 @@ Function ВосстановитьФайл(Val URL, Val IDФайла, Val Ток
|
||||
EndFunction
|
||||
|
||||
Function СкопироватьФайл(Val URL, Val IDФайла, Val IDКаталога, Val Токен = "") Export
|
||||
Return MakeCopyFile(URL, IDФайла, IDКаталога, Токен);
|
||||
Return MakeFileCopy(URL, IDФайла, IDКаталога, Токен);
|
||||
EndFunction
|
||||
|
||||
Function ПереместитьФайлВКаталог(Val URL, Val IDФайла, Val IDКаталога, Val Токен = "") Export
|
||||
|
||||
12
src/en/OInt/tests/Modules/internal/OPI_Tests.os
vendored
12
src/en/OInt/tests/Modules/internal/OPI_Tests.os
vendored
@@ -1519,7 +1519,7 @@ Procedure B24_WorkingWithDrive() Export
|
||||
Bitrix24_MoveFileToFolder(TestParameters);
|
||||
Bitrix24_MakeFolderCopy(TestParameters);
|
||||
Bitrix24_UploadFileToFolder(TestParameters);
|
||||
Bitrix24_MakeCopyFile(TestParameters);
|
||||
Bitrix24_MakeFileCopy(TestParameters);
|
||||
Bitrix24_DeleteFile(TestParameters);
|
||||
Bitrix24_GetFolderFilterStructure(TestParameters);
|
||||
Bitrix24_GetFolderItems(TestParameters);
|
||||
@@ -8734,27 +8734,27 @@ Procedure Bitrix24_UploadFileToFolder(FunctionParameters)
|
||||
|
||||
EndProcedure
|
||||
|
||||
Procedure Bitrix24_MakeCopyFile(FunctionParameters)
|
||||
Procedure Bitrix24_MakeFileCopy(FunctionParameters)
|
||||
|
||||
FolderID = FunctionParameters["Bitrix24_HookFolderID"];
|
||||
FileID = FunctionParameters["Bitrix24_FileID"];
|
||||
|
||||
URL = FunctionParameters["Bitrix24_URL"];
|
||||
|
||||
Result = OPI_Bitrix24.MakeCopyFile(URL, FileID, FolderID);
|
||||
Result = OPI_Bitrix24.MakeFileCopy(URL, FileID, FolderID);
|
||||
|
||||
Process(Result, "Bitrix24", "MakeCopyFile", "Hook"); // SKIP
|
||||
Process(Result, "Bitrix24", "MakeFileCopy", "Hook"); // SKIP
|
||||
|
||||
FolderID = FunctionParameters["Bitrix24_FolderID"];
|
||||
|
||||
URL = FunctionParameters["Bitrix24_Domain"];
|
||||
Token = FunctionParameters["Bitrix24_Token"];
|
||||
|
||||
Result = OPI_Bitrix24.MakeCopyFile(URL, FileID, FolderID, Token);
|
||||
Result = OPI_Bitrix24.MakeFileCopy(URL, FileID, FolderID, Token);
|
||||
|
||||
// END
|
||||
|
||||
Process(Result, "Bitrix24", "MakeCopyFile");
|
||||
Process(Result, "Bitrix24", "MakeFileCopy");
|
||||
|
||||
EndProcedure
|
||||
|
||||
|
||||
@@ -1520,7 +1520,7 @@ Procedure B24_WorkingWithDrive() Export
|
||||
Bitrix24_MoveFileToFolder(TestParameters);
|
||||
Bitrix24_MakeFolderCopy(TestParameters);
|
||||
Bitrix24_UploadFileToFolder(TestParameters);
|
||||
Bitrix24_MakeCopyFile(TestParameters);
|
||||
Bitrix24_MakeFileCopy(TestParameters);
|
||||
Bitrix24_DeleteFile(TestParameters);
|
||||
Bitrix24_GetFolderFilterStructure(TestParameters);
|
||||
Bitrix24_GetFolderItems(TestParameters);
|
||||
@@ -10856,7 +10856,7 @@ Procedure Bitrix24_UploadFileToFolder(FunctionParameters)
|
||||
|
||||
EndProcedure
|
||||
|
||||
Procedure Bitrix24_MakeCopyFile(FunctionParameters)
|
||||
Procedure Bitrix24_MakeFileCopy(FunctionParameters)
|
||||
|
||||
FolderID = FunctionParameters["Bitrix24_HookFolderID"];
|
||||
FileID = FunctionParameters["Bitrix24_FileID"];
|
||||
@@ -10868,9 +10868,9 @@ Procedure Bitrix24_MakeCopyFile(FunctionParameters)
|
||||
Options.Insert("", FileID);
|
||||
Options.Insert("", FolderID);
|
||||
|
||||
Result = OPI_TestDataRetrieval.ExecuteTestCLI("bitrix24", "MakeCopyFile", Options);
|
||||
Result = OPI_TestDataRetrieval.ExecuteTestCLI("bitrix24", "MakeFileCopy", Options);
|
||||
|
||||
Process(Result, "Bitrix24", "MakeCopyFile", "Hook"); // SKIP
|
||||
Process(Result, "Bitrix24", "MakeFileCopy", "Hook"); // SKIP
|
||||
|
||||
FolderID = FunctionParameters["Bitrix24_FolderID"];
|
||||
|
||||
@@ -10883,11 +10883,11 @@ Procedure Bitrix24_MakeCopyFile(FunctionParameters)
|
||||
Options.Insert("", FolderID);
|
||||
Options.Insert("", Token);
|
||||
|
||||
Result = OPI_TestDataRetrieval.ExecuteTestCLI("bitrix24", "MakeCopyFile", Options);
|
||||
Result = OPI_TestDataRetrieval.ExecuteTestCLI("bitrix24", "MakeFileCopy", Options);
|
||||
|
||||
// END
|
||||
|
||||
Process(Result, "Bitrix24", "MakeCopyFile");
|
||||
Process(Result, "Bitrix24", "MakeFileCopy");
|
||||
|
||||
EndProcedure
|
||||
|
||||
|
||||
@@ -4931,7 +4931,7 @@ Function Check_Bitrix24_UploadFileToFolder(Val Result, Val Option, URL = "", Tok
|
||||
|
||||
EndFunction
|
||||
|
||||
Function Check_Bitrix24_MakeCopyFile(Val Result, Val Option)
|
||||
Function Check_Bitrix24_MakeFileCopy(Val Result, Val Option)
|
||||
|
||||
ExpectsThat(Result["result"]).ИмеетТип("Map");
|
||||
ExpectsThat(Result["result"]["ID"]).Заполнено();
|
||||
|
||||
@@ -3758,8 +3758,8 @@ Function GetComposition() Export
|
||||
NewLine = CompositionTable.Add();
|
||||
NewLine.Library = "bitrix24";
|
||||
NewLine.Module = "OPI_Bitrix24";
|
||||
NewLine.Method = "MakeCopyFile";
|
||||
NewLine.SearchMethod = "MAKECOPYFILE";
|
||||
NewLine.Method = "MakeFileCopy";
|
||||
NewLine.SearchMethod = "MAKEFILECOPY";
|
||||
NewLine.Parameter = "--url";
|
||||
NewLine.Description = "URL of webhook or a Bitrix24 domain, when token used";
|
||||
NewLine.Region = "File management";
|
||||
@@ -3769,8 +3769,8 @@ Function GetComposition() Export
|
||||
NewLine = CompositionTable.Add();
|
||||
NewLine.Library = "bitrix24";
|
||||
NewLine.Module = "OPI_Bitrix24";
|
||||
NewLine.Method = "MakeCopyFile";
|
||||
NewLine.SearchMethod = "MAKECOPYFILE";
|
||||
NewLine.Method = "MakeFileCopy";
|
||||
NewLine.SearchMethod = "MAKEFILECOPY";
|
||||
NewLine.Parameter = "--fileid";
|
||||
NewLine.Description = "Original file ID";
|
||||
NewLine.Region = "File management";
|
||||
@@ -3779,8 +3779,8 @@ Function GetComposition() Export
|
||||
NewLine = CompositionTable.Add();
|
||||
NewLine.Library = "bitrix24";
|
||||
NewLine.Module = "OPI_Bitrix24";
|
||||
NewLine.Method = "MakeCopyFile";
|
||||
NewLine.SearchMethod = "MAKECOPYFILE";
|
||||
NewLine.Method = "MakeFileCopy";
|
||||
NewLine.SearchMethod = "MAKEFILECOPY";
|
||||
NewLine.Parameter = "--folderid";
|
||||
NewLine.Description = "ID of copy destination folder";
|
||||
NewLine.Region = "File management";
|
||||
@@ -3789,8 +3789,8 @@ Function GetComposition() Export
|
||||
NewLine = CompositionTable.Add();
|
||||
NewLine.Library = "bitrix24";
|
||||
NewLine.Module = "OPI_Bitrix24";
|
||||
NewLine.Method = "MakeCopyFile";
|
||||
NewLine.SearchMethod = "MAKECOPYFILE";
|
||||
NewLine.Method = "MakeFileCopy";
|
||||
NewLine.SearchMethod = "MAKEFILECOPY";
|
||||
NewLine.Parameter = "--token";
|
||||
NewLine.Description = "Access token, when app auth method used (optional, def. val. - Empty value)";
|
||||
NewLine.Region = "File management";
|
||||
|
||||
2
src/ru/OInt/core/Modules/OPI_Bitrix24.os
vendored
2
src/ru/OInt/core/Modules/OPI_Bitrix24.os
vendored
@@ -5629,7 +5629,7 @@ Function RestoreFile(Val URL, Val FileID, Val Token = "") Export
|
||||
Return ВосстановитьФайл(URL, FileID, Token);
|
||||
EndFunction
|
||||
|
||||
Function MakeCopyFile(Val URL, Val FileID, Val FolderID, Val Token = "") Export
|
||||
Function MakeFileCopy(Val URL, Val FileID, Val FolderID, Val Token = "") Export
|
||||
Return СкопироватьФайл(URL, FileID, FolderID, Token);
|
||||
EndFunction
|
||||
|
||||
|
||||
Reference in New Issue
Block a user