mirror of
https://github.com/usememos/memos.git
synced 2025-06-05 22:09:59 +02:00
chore: create memo visibility when creating
This commit is contained in:
@ -53,6 +53,15 @@ func (s *APIV2Service) CreateMemo(ctx context.Context, request *apiv2pb.CreateMe
|
|||||||
Content: request.Content,
|
Content: request.Content,
|
||||||
Visibility: store.Visibility(request.Visibility.String()),
|
Visibility: store.Visibility(request.Visibility.String()),
|
||||||
}
|
}
|
||||||
|
// Find disable public memos system setting.
|
||||||
|
disablePublicMemosSystem, err := s.getDisablePublicMemosSystemSettingValue(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, status.Errorf(codes.Internal, "failed to get system setting")
|
||||||
|
}
|
||||||
|
if disablePublicMemosSystem && create.Visibility == store.Public {
|
||||||
|
return nil, status.Errorf(codes.PermissionDenied, "disable public memos system setting is enabled")
|
||||||
|
}
|
||||||
|
|
||||||
memo, err := s.Store.CreateMemo(ctx, create)
|
memo, err := s.Store.CreateMemo(ctx, create)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
@ -591,6 +600,21 @@ func (s *APIV2Service) getMemoDisplayWithUpdatedTsSettingValue(ctx context.Conte
|
|||||||
return memoDisplayWithUpdatedTs, nil
|
return memoDisplayWithUpdatedTs, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *APIV2Service) getDisablePublicMemosSystemSettingValue(ctx context.Context) (bool, error) {
|
||||||
|
disablePublicMemosSystemSetting, err := s.Store.GetSystemSetting(ctx, &store.FindSystemSetting{
|
||||||
|
Name: apiv1.SystemSettingDisablePublicMemosName.String(),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
return false, errors.Wrap(err, "failed to find system setting")
|
||||||
|
}
|
||||||
|
disablePublicMemos := false
|
||||||
|
err = json.Unmarshal([]byte(disablePublicMemosSystemSetting.Value), &disablePublicMemos)
|
||||||
|
if err != nil {
|
||||||
|
return false, errors.Wrap(err, "failed to unmarshal system setting value")
|
||||||
|
}
|
||||||
|
return disablePublicMemos, nil
|
||||||
|
}
|
||||||
|
|
||||||
func convertVisibilityFromStore(visibility store.Visibility) apiv2pb.Visibility {
|
func convertVisibilityFromStore(visibility store.Visibility) apiv2pb.Visibility {
|
||||||
switch visibility {
|
switch visibility {
|
||||||
case store.Private:
|
case store.Private:
|
||||||
|
@ -8,7 +8,7 @@ interface Props {
|
|||||||
const Table = ({ header, rows }: Props) => {
|
const Table = ({ header, rows }: Props) => {
|
||||||
return (
|
return (
|
||||||
<table className="w-auto max-w-full border border-gray-300 dark:border-zinc-600 divide-y divide-gray-300 dark:divide-zinc-600">
|
<table className="w-auto max-w-full border border-gray-300 dark:border-zinc-600 divide-y divide-gray-300 dark:divide-zinc-600">
|
||||||
<thead className="text-sm font-semibold leading-5 text-left text-gray-900 dark:text-gray-400">
|
<thead className="text-sm font-medium leading-5 text-left text-gray-900 dark:text-gray-400">
|
||||||
<tr className="divide-x divide-gray-300 dark:divide-zinc-600">
|
<tr className="divide-x divide-gray-300 dark:divide-zinc-600">
|
||||||
{header.map((h, i) => (
|
{header.map((h, i) => (
|
||||||
<th key={i} className="py-1 px-2">
|
<th key={i} className="py-1 px-2">
|
||||||
|
@ -340,7 +340,7 @@ const MemoEditor = (props: Props) => {
|
|||||||
editorRef.current?.setContent("");
|
editorRef.current?.setContent("");
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
toast.error(error.response.data.message);
|
toast.error(error.details);
|
||||||
}
|
}
|
||||||
|
|
||||||
setState((state) => {
|
setState((state) => {
|
||||||
|
@ -125,10 +125,13 @@ const Timeline = () => {
|
|||||||
<div className="w-full shadow flex flex-col justify-start items-start px-4 py-3 rounded-xl bg-white dark:bg-zinc-800 text-black dark:text-gray-300">
|
<div className="w-full shadow flex flex-col justify-start items-start px-4 py-3 rounded-xl bg-white dark:bg-zinc-800 text-black dark:text-gray-300">
|
||||||
<div className="relative w-full flex flex-row justify-between items-center">
|
<div className="relative w-full flex flex-row justify-between items-center">
|
||||||
<div>
|
<div>
|
||||||
<p className="py-1 flex flex-row justify-start items-center select-none opacity-80">
|
<div
|
||||||
|
className="py-1 flex flex-row justify-start items-center select-none opacity-80"
|
||||||
|
onClick={() => setSelectedDay(undefined)}
|
||||||
|
>
|
||||||
<Icon.GanttChartSquare className="w-6 h-auto mr-1 opacity-80" />
|
<Icon.GanttChartSquare className="w-6 h-auto mr-1 opacity-80" />
|
||||||
<span className="text-lg">{t("timeline.title")}</span>
|
<span className="text-lg">{t("timeline.title")}</span>
|
||||||
</p>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="flex justify-end items-center gap-2">
|
<div className="flex justify-end items-center gap-2">
|
||||||
<IconButton variant="outlined" size="sm" onClick={() => handleNewMemo()}>
|
<IconButton variant="outlined" size="sm" onClick={() => handleNewMemo()}>
|
||||||
|
Reference in New Issue
Block a user