Merge branch 'release/1.0.0' of github.com:ONLYOFFICE/AppServer into release/1.0.0
This commit is contained in:
commit
10d5b0e403
@ -157,7 +157,7 @@ namespace ASC.ElasticSearch.Core
|
|||||||
|
|
||||||
public bool CanIndexByContent(Type t, int tenantId)
|
public bool CanIndexByContent(Type t, int tenantId)
|
||||||
{
|
{
|
||||||
if (typeof(ISearchItemDocument).IsAssignableFrom(t))
|
if (!typeof(ISearchItemDocument).IsAssignableFrom(t))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -8,7 +8,7 @@ import Loaders from "@appserver/common/components/Loaders";
|
|||||||
import withLoader from "../../../HOCs/withLoader";
|
import withLoader from "../../../HOCs/withLoader";
|
||||||
|
|
||||||
const StyledDownloadAppList = styled.div`
|
const StyledDownloadAppList = styled.div`
|
||||||
margin-top: 42px;
|
margin-top: 20px;
|
||||||
|
|
||||||
.download-app-list {
|
.download-app-list {
|
||||||
padding-top: 3px;
|
padding-top: 3px;
|
||||||
@ -35,7 +35,7 @@ const DownloadAppListContainer = ({ t }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<StyledDownloadAppList>
|
<StyledDownloadAppList>
|
||||||
<Text color="#555F65" fontSize="14px" fontWeight={600}>
|
<Text color="#83888d" fontSize="14px" fontWeight={600}>
|
||||||
{t("Translations:DownloadApps")}
|
{t("Translations:DownloadApps")}
|
||||||
</Text>
|
</Text>
|
||||||
<div className="download-app-list">
|
<div className="download-app-list">
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
import React from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import Badge from "@appserver/components/badge";
|
import Badge from "@appserver/components/badge";
|
||||||
import IconButton from "@appserver/components/icon-button";
|
import IconButton from "@appserver/components/icon-button";
|
||||||
import {
|
import {
|
||||||
@ -30,6 +30,7 @@ const Badges = ({
|
|||||||
const isFavorite = fileStatus === 32;
|
const isFavorite = fileStatus === 32;
|
||||||
const isEditing = fileStatus === 1;
|
const isEditing = fileStatus === 1;
|
||||||
const isNewWithFav = fileStatus === 34;
|
const isNewWithFav = fileStatus === 34;
|
||||||
|
const isEditingWithFav = fileStatus === 33;
|
||||||
const showEditBadge = !locked || item.access === 0;
|
const showEditBadge = !locked || item.access === 0;
|
||||||
const isPrivacy = isPrivacyFolder && isDesktopClient;
|
const isPrivacy = isPrivacyFolder && isDesktopClient;
|
||||||
|
|
||||||
@ -48,6 +49,7 @@ const Badges = ({
|
|||||||
)}
|
)}
|
||||||
{canWebEdit &&
|
{canWebEdit &&
|
||||||
!isEditing &&
|
!isEditing &&
|
||||||
|
!isEditingWithFav &&
|
||||||
!isTrashFolder &&
|
!isTrashFolder &&
|
||||||
!isPrivacy &&
|
!isPrivacy &&
|
||||||
accessToEdit &&
|
accessToEdit &&
|
||||||
@ -63,6 +65,13 @@ const Badges = ({
|
|||||||
hoverColor="#3B72A7"
|
hoverColor="#3B72A7"
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
{(isEditing || isEditingWithFav) && (
|
||||||
|
<StyledFileActionsConvertEditDocIcon
|
||||||
|
onClick={onFilesClick}
|
||||||
|
className="badge icons-group is-editing"
|
||||||
|
size="small"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
{locked && accessToEdit && (
|
{locked && accessToEdit && (
|
||||||
<StyledFileActionsLockedIcon
|
<StyledFileActionsLockedIcon
|
||||||
className="badge lock-file icons-group"
|
className="badge lock-file icons-group"
|
||||||
@ -72,7 +81,7 @@ const Badges = ({
|
|||||||
onClick={onClickLock}
|
onClick={onClickLock}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{(isFavorite || isNewWithFav) && !isTrashFolder && (
|
{(isFavorite || isNewWithFav || isEditingWithFav) && !isTrashFolder && (
|
||||||
<StyledFavoriteIcon
|
<StyledFavoriteIcon
|
||||||
className="favorite icons-group badge"
|
className="favorite icons-group badge"
|
||||||
size="small"
|
size="small"
|
||||||
@ -82,13 +91,6 @@ const Badges = ({
|
|||||||
onClick={onClickFavorite}
|
onClick={onClickFavorite}
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
{isEditing && (
|
|
||||||
<StyledFileActionsConvertEditDocIcon
|
|
||||||
onClick={onFilesClick}
|
|
||||||
className="badge icons-group is-editing"
|
|
||||||
size="small"
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
{versionGroup > 1 && (
|
{versionGroup > 1 && (
|
||||||
<Badge
|
<Badge
|
||||||
className="badge-version icons-group"
|
className="badge-version icons-group"
|
||||||
|
@ -39,6 +39,7 @@ import SharingDialog from "files/SharingDialog";
|
|||||||
import { createNewFile, getDefaultFileName, openDocEditor } from "files/utils";
|
import { createNewFile, getDefaultFileName, openDocEditor } from "files/utils";
|
||||||
import i18n from "./i18n";
|
import i18n from "./i18n";
|
||||||
import { FolderType } from "@appserver/common/constants";
|
import { FolderType } from "@appserver/common/constants";
|
||||||
|
|
||||||
let documentIsReady = false;
|
let documentIsReady = false;
|
||||||
|
|
||||||
const text = "text";
|
const text = "text";
|
||||||
@ -362,6 +363,16 @@ const Editor = () => {
|
|||||||
goback,
|
goback,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (url.indexOf("anchor") !== -1) {
|
||||||
|
const splitUrl = url.split("anchor=");
|
||||||
|
const decodeURI = decodeURIComponent(splitUrl[1]);
|
||||||
|
const obj = JSON.parse(decodeURI);
|
||||||
|
|
||||||
|
config.editorConfig.actionLink = {
|
||||||
|
action: obj.action,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
let onRequestSharingSettings;
|
let onRequestSharingSettings;
|
||||||
let onRequestRename;
|
let onRequestRename;
|
||||||
let onRequestCreateNew;
|
let onRequestCreateNew;
|
||||||
@ -391,6 +402,7 @@ const Editor = () => {
|
|||||||
onRequestSharingSettings,
|
onRequestSharingSettings,
|
||||||
onRequestRename,
|
onRequestRename,
|
||||||
onRequestCreateNew,
|
onRequestCreateNew,
|
||||||
|
onMakeActionLink: onMakeActionLink,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -449,6 +461,24 @@ const Editor = () => {
|
|||||||
updateFile(fileInfo.id, title);
|
updateFile(fileInfo.id, title);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const onMakeActionLink = (event) => {
|
||||||
|
var ACTION_DATA = event.data;
|
||||||
|
|
||||||
|
const link = generateLink(ACTION_DATA);
|
||||||
|
|
||||||
|
const urlFormation = !config.editorConfig.actionLink
|
||||||
|
? url
|
||||||
|
: url.split("&anchor=")[0];
|
||||||
|
|
||||||
|
const linkFormation = `${urlFormation}&anchor=${link}`;
|
||||||
|
|
||||||
|
docEditor.setActionLink(linkFormation);
|
||||||
|
};
|
||||||
|
|
||||||
|
const generateLink = (actionData) => {
|
||||||
|
return encodeURIComponent(JSON.stringify(actionData));
|
||||||
|
};
|
||||||
|
|
||||||
const onCancel = () => {
|
const onCancel = () => {
|
||||||
setIsVisible(false);
|
setIsVisible(false);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user