Fixes #285

projectOpenRAP · Jul 16, 2018 · 402434d · 402434d
1 parent d9ab250
commit 402434d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/devmgmtui/src/components/filemgmt/FileDisplayComponent.js b/devmgmtui/src/components/filemgmt/FileDisplayComponent.js
@@ -161,16 +161,26 @@ class FileDisplayComponent extends Component {
         Currently at : {this.props.filemgmt.currentDir}
       </div>
       <Divider></Divider>
-      <Button animated color='linkedin' onClick={this.selectAll.bind(this)}>
-        <Button.Content visible>{this.state.allSelected && this.props.filemgmt.selectedFiles.length ? 'Uns' : 'S'}elect All</Button.Content>
-        <Button.Content hidden><Icon name='check circle' /></Button.Content>
-      </Button>
-      <span style={{float:'right'}}>
-        <Button animated  onClick={this.deleteSelected.bind(this)} negative>
-          <Button.Content visible>Delete Selected</Button.Content>
-          <Button.Content hidden><Icon name='remove circle' /></Button.Content>
-        </Button>
-      </span>
+      {this.props.auth.user.permissions.search(/DELETE_FILES|ALL/) >= 0 ?
+          <span>
+              <Button animated color='linkedin' onClick={this.selectAll.bind(this)}>
+                <Button.Content visible>{this.state.allSelected && this.props.filemgmt.selectedFiles.length ? 'Uns' : 'S'}elect All</Button.Content>
+                <Button.Content hidden><Icon name='check circle' /></Button.Content>
+              </Button>
+          </span>
+          :
+          null
+      }
+      {this.props.auth.user.permissions.search(/DELETE_FILES|ALL/) >= 0 ?
+          <span style={{float:'right'}}>
+            <Button animated  onClick={this.deleteSelected.bind(this)} negative>
+              <Button.Content visible>Delete Selected</Button.Content>
+              <Button.Content hidden><Icon name='remove circle' /></Button.Content>
+            </Button>
+          </span>
+          :
+          null
+      }
       <Divider></Divider>
         <div>
           {this.renderFileDisplayComponent()}

diff --git a/devmgmtui/src/components/filemgmt/FileMgmt.js b/devmgmtui/src/components/filemgmt/FileMgmt.js
@@ -39,7 +39,11 @@ class FileMgmt extends Component {
                 <Header as='h1'>File Management</Header>
               </Grid.Column>
               <Grid.Column>
-                <Header as='h1'>File Upload</Header>
+                { this.props.auth.user.permissions.search(/UPLOAD_FILES|ALL/) >= 0 ?
+                    <Header as='h1'>File Upload</Header>
+                    :
+                    null
+                }
               </Grid.Column>
             </Grid.Row>
             <Grid.Row>