From 3137583b0f608538785fabdacd7e522afc14442b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Mon, 10 Aug 2015 14:06:01 +0200
Subject: [PATCH] adjust button choose logic

---
 .../ascribe_forms/form_request_action.js      | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/js/components/ascribe_forms/form_request_action.js b/js/components/ascribe_forms/form_request_action.js
index 834ea2d5..7195d721 100644
--- a/js/components/ascribe_forms/form_request_action.js
+++ b/js/components/ascribe_forms/form_request_action.js
@@ -2,8 +2,6 @@
 
 import React from 'react';
 
-import FormMixin from '../../mixins/form_mixin';
-
 import AclButton from './../ascribe_buttons/acl_button';
 import ActionPanel from '../ascribe_panel/action_panel';
 import Form from './form';
@@ -78,7 +76,7 @@ let RequestActionForm = React.createClass({
         );
     },
 
-    getAcceptButton() {
+    getAcceptButtonForm() {
         let edition = this.props.editions[0];
 
         if(edition.request_action === 'unconsign') {
@@ -92,11 +90,17 @@ let RequestActionForm = React.createClass({
                 );
         } else {
             return (
-                <button
-                    type="submit"
-                    className='btn btn-default btn-sm ascribe-margin-1px'>
-                    {getLangText('ACCEPT')}
-                </button>
+                <Form
+                    url={urls.accept}
+                    getFormData={this.getFormData}
+                    handleSuccess={this.showNotification(getLangText('denied'), edition.request_action, edition.owner)}
+                    className='inline pull-right'>
+                    <button
+                        type="submit"
+                        className='btn btn-default btn-sm ascribe-margin-1px'>
+                        {getLangText('ACCEPT')}
+                    </button>
+                </Form>
             );
         }
     },
@@ -105,7 +109,7 @@ let RequestActionForm = React.createClass({
         let edition = this.props.editions[0];
 
         let urls = this.getUrls();
-        let acceptButton = this.getAcceptButton();
+        let acceptButtonForm = this.getAcceptButtonForm();
 
         return (
             <div>
@@ -120,13 +124,7 @@ let RequestActionForm = React.createClass({
                             {getLangText('REJECT')}
                     </button>
                 </Form>
-                <Form
-                    url={urls.accept}
-                    getFormData={this.getFormData}
-                    handleSuccess={this.showNotification(getLangText('denied'), edition.request_action, edition.owner)}
-                    className='inline pull-right'>
-                    {acceptButton}
-                </Form>
+                {acceptButtonForm}
             </div>
         );
     },