Merge pull request #60 from kufu/fixes/release1

リリース用Fix
kufu · Aug 30, 2021 · 0fc9d99 · 0fc9d99
2 parents 015d3a4 + 20ce825
commit 0fc9d99
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
@@ -34,6 +34,9 @@ def editable
       flash[:error] = I18n.t('errors.password_incorrect')
       head :unauthorized
     end
+  rescue
+    flash[:error] = I18n.t('errors.password_incorrect')
+    head :unauthorized
   end
 
   def create

diff --git a/app/javascript/components/PlanDescription.tsx b/app/javascript/components/PlanDescription.tsx
@@ -55,9 +55,12 @@ export const PlanDescription: React.VFC<Props> = (props) => {
               <Text size="S" color="TEXT_GREY">{i18n.notice}</Text>
             </Stack>
 
-            <SecondaryButton size="s" prefix={<FaPencilAltIcon size={11}/>} onClick={() => setIsDialogOpen(true)}>
-              <Text size="S" weight="bold">{i18n.button}</Text>
-            </SecondaryButton>
+            {form ?
+              <SecondaryButton size="s" prefix={<FaPencilAltIcon size={11}/>} onClick={() => setIsDialogOpen(true)}>
+                <Text size="S" weight="bold">{i18n.button}</Text>
+              </SecondaryButton>
+              : null
+            }
            </LineUp>
          <DescriptionBase>
           <Text>{description}</Text>