Compare commits

...

2 Commits

Author SHA1 Message Date
Yang Luo
0d02b5e768 feat: remove disabled state in syncer.table 2024-09-07 21:08:21 +08:00
Yang Luo
ba8d0b5f46 feat: Revert "feat: Users added through LDAP cannot log in using the set password" (#3186)
This reverts commit 973a1df6c2.
2024-09-07 20:55:14 +08:00
2 changed files with 5 additions and 6 deletions

View File

@@ -354,8 +354,8 @@ func CheckUserPassword(organization string, username string, password string, la
}
}
if user.Ldap != "" && (isSigninViaLdap || user.Password == "") {
if !isPasswordWithLdapEnabled {
if user.Ldap != "" {
if !isSigninViaLdap && !isPasswordWithLdapEnabled {
return nil, fmt.Errorf(i18n.Translate(lang, "check:password or code is incorrect"))
}

View File

@@ -434,10 +434,9 @@ class SyncerEditPage extends React.Component {
{Setting.getLabel(i18next.t("syncer:Table"), i18next.t("syncer:Table - Tooltip"))} :
</Col>
<Col span={22} >
<Input value={this.state.syncer.table}
disabled={this.state.syncer.type === "Keycloak"} onChange={e => {
this.updateSyncerField("table", e.target.value);
}} />
<Input value={this.state.syncer.table} onChange={e => {
this.updateSyncerField("table", e.target.value);
}} />
</Col>
</Row>
<Row style={{marginTop: "20px"}} >