[FIX] Ref #260 Disable org name edition if non admin

ozwillo · Dec 3, 2015 · fbbbc5c · fbbbc5c
1 parent 1ab8c6c
commit fbbbc5c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/...lo-portal-front/src/main/resources/public/js/network/create-or-modify-organization.jsx.js b/...lo-portal-front/src/main/resources/public/js/network/create-or-modify-organization.jsx.js
@@ -32,7 +32,6 @@ var CreateOrModifyOrganizationModal = React.createClass({
         var modalTitle = (this.state.organization.exist ? t('my.network.modify-org') : t('my.network.create-org'))
             + " " + this.state.organization.legal_name;
         var modalSubTitle = t('my.network.organization.step') + " " + this.state.step + " / 2";
-
         return (
             <div className="modal fade" tabIndex="-1" role="dialog" aria-labelledby="modalLabel">
                 <div className='modal-dialog modal-lg' role="document">
@@ -50,7 +49,9 @@ var CreateOrModifyOrganizationModal = React.createClass({
                                                         organization={this.state.organization}
                                                         step={this.state.step}
                                                         onStepChange={this.onStepChange}
-                                                        fromStore={false} />
+                                                        fromStore={false}
+                                                        org={this.props.org}
+                        />
                     </div>
                 </div>
             </div>
@@ -133,15 +134,14 @@ var CreateOrModifyOrganizationForm = React.createClass({
     },
     render: function () {
         var organization = this.props.organization;
-
         return (
             <div>
                 <div className="modal-body">
                     <form id="add-organization" onSubmit={this.onCreate} className="form-horizontal">
                         <div className="form-horizontal">
                             <Tab1 id="1" ref="tab1" organization={organization} currentTab={this.props.step}
                                   fromStore={this.props.fromStore} />
-                            <Tab2 id="2" ref="tab2" organization={organization} currentTab={this.props.step} />
+                            <Tab2 id="2" ref="tab2" organization={organization} currentTab={this.props.step} org={this.props.org}/>
                         </div>
                         {this.renderCreateOrUpdateError()}
                     </form>
@@ -501,6 +501,7 @@ var Tab2 = React.createClass({
         var taxRegNumLabels = this.getTaxRegLabels();
         var tax_reg_activity_uri_placeholder = !this.state.organization.tax_reg_activity_uri ? ' '
             : this.state.organization.tax_reg_activity_uri.substring(this.state.organization.tax_reg_activity_uri.lastIndexOf("/") + 1);
+        var not_admin = !this.props.org.admin;
 
         return (
             <div id="tab2" className={className}>
@@ -511,7 +512,8 @@ var Tab2 = React.createClass({
                                 <legend>{t('my.network.organization.additional_information')}</legend>
                                 <Field name="legal_name" error={$.inArray("legal_name", this.state.errors) != -1} isRequired={true}>
                                     <input className="form-control" ref="legal_name" id="legal_name" type="text"
-                                           value={this.state.organization.legal_name} onChange={this.handleInputChange} />
+                                           value={this.state.organization.legal_name} onChange={this.handleInputChange}
+                                           disabled={not_admin} />
                                 </Field>
                                 <Field name={taxRegNumLabels.tax_reg_num_label} error={$.inArray("tax_reg_num", this.state.errors) != -1} isRequired={true}>
                                     <input className="form-control" ref="tax_reg_num" id="tax_reg_num" type="text"

diff --git a/portal-parent/ozwillo-portal-front/src/main/resources/public/js/network/network.jsx.js b/portal-parent/ozwillo-portal-front/src/main/resources/public/js/network/network.jsx.js
@@ -14,7 +14,6 @@ var MyNetwork = React.createClass({
         return (
                 <div>
                     <SearchOrganizationModal ref="searchOrgDialog" successHandler={this.openCreateOrgDialog} />
-                    <CreateOrModifyOrganizationModal ref="createOrgDialog" successHandler={this.reload} />
                     <SearchOrCreateHeader showDialog={this.openSearchOrgDialog}/>
                     <OrganizationsList ref="orgs"/>
                 </div>
@@ -606,7 +605,7 @@ var InformationDialog = React.createClass({
         var modal = undefined;
         if(this.state.organization){
             modal = (
-                <CreateOrModifyOrganizationModal ref="modalModifyKAndDCOrg" successHandler={this.props.onUpdate} />
+                <CreateOrModifyOrganizationModal ref="modalModifyKAndDCOrg" successHandler={this.props.onUpdate} org={this.props.org} />
             );
         }else{
            {/* This part is to show a short message to users of very old organizations that doesnt exist in DC */}