CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/react_test

Browse Source 
# Conflicts:
#	static/main/js/control_page/control.js
This commit is contained in:
Yuriy Kulakov
2021-04-29 16:52:31 +03:00
parent 760d28a768 96e5865d3b
commit 82fde03db9
12 changed files with 45 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
static/main/js/control_page/control.js
View File

@@ -1,3 +1,5 @@
"use strict";
function head_checkbox() {
let head_checkbox = document.getElementById("head-checkbox");
head_checkbox.addEventListener("click", () => {
@@ -33,7 +35,7 @@ class ModelUserTableRows extends React.Component {
render() {
return ReactDOM.createPortal(
this.props.users.map((user, key) => (
<ModelUserTableRow user={user} key={key}/>
<ModelUserTableRow user={user} key={key} />
)),
document.getElementById("tbody")
);
@@ -46,14 +48,14 @@ class ZendeskUserTableRow extends React.Component {
<tr className={"table-secondary text-secondary"}>
<td></td>
<td>
<a href="#" style={{color: "grey", fontStyle: "italic"}}>
<a href="#" style={{ color: "grey", fontStyle: "italic" }}>
{this.props.user.name}
</a>
</td>
<td style={{color: "grey", fontStyle: "italic"}}>
<td style={{ color: "grey", fontStyle: "italic" }}>
{this.props.user.email}
</td>
<td style={{color: "grey", fontStyle: "italic"}}>
<td style={{ color: "grey", fontStyle: "italic" }}>
{this.props.user.zendesk_role}
</td>
</tr>
@@ -65,7 +67,7 @@ class ZendeskUserTableRows extends React.Component {
render() {
return ReactDOM.createPortal(
this.props.users.map((user, key) => (
<ZendeskUserTableRow user={user} key={key}/>
<ZendeskUserTableRow user={user} key={key} />
)),
document.getElementById("tbody")
);
@@ -127,12 +129,12 @@ class TableBody extends React.Component {
render() {
return (
<tr>
<ModelUserTableRows users={this.state.users}/>
<ZendeskUserTableRows users={this.state.zendesk_users}/>
<ModelUserTableRows users={this.state.users} />
<ZendeskUserTableRows users={this.state.zendesk_users} />
</tr>
);
}
}
ReactDOM.render(<TableBody/>, document.getElementById("tbody"));
ReactDOM.render(<TableBody />, document.getElementById("tbody"));
head_checkbox();