Yuki Takei 6 лет назад
Родитель
Сommit
c6f6fa6ff1

+ 1 - 1
src/client/js/components/Admin/UserGroupDetail/UserGroupUserFormByInput.jsx

@@ -98,7 +98,7 @@ class UserGroupUserFormByInput extends React.Component {
     const user = option;
     const user = option;
     return (
     return (
       <React.Fragment>
       <React.Fragment>
-        <UserPicture user={user} size="sm" withoutLink />
+        <UserPicture user={user} size="sm" noLink noTooltip />
         <strong className="ml-2">{user.username}</strong>
         <strong className="ml-2">{user.username}</strong>
         {adminUserGroupDetailContainer.state.isAlsoNameSearched && <span className="ml-2">{user.name}</span>}
         {adminUserGroupDetailContainer.state.isAlsoNameSearched && <span className="ml-2">{user.name}</span>}
         {adminUserGroupDetailContainer.state.isAlsoMailSearched && <span className="ml-2">{user.email}</span>}
         {adminUserGroupDetailContainer.state.isAlsoMailSearched && <span className="ml-2">{user.email}</span>}

+ 1 - 1
src/client/js/components/Navbar/PersonalDropdown.jsx

@@ -59,7 +59,7 @@ const PersonalDropdown = (props) => {
       {/* remove .dropdown-toggle for hide caret */}
       {/* remove .dropdown-toggle for hide caret */}
       {/* See https://stackoverflow.com/a/44577512/13183572 */}
       {/* See https://stackoverflow.com/a/44577512/13183572 */}
       <a className="nav-link waves-effect waves-light" data-toggle="dropdown">
       <a className="nav-link waves-effect waves-light" data-toggle="dropdown">
-        <UserPicture user={user} withoutLink withoutTooltip /><span className="d-none d-sm-inline-block">&nbsp;{user.name}</span>
+        <UserPicture user={user} noLink noTooltip /><span className="d-none d-sm-inline-block">&nbsp;{user.name}</span>
       </a>
       </a>
 
 
       {/* Menu */}
       {/* Menu */}

+ 1 - 1
src/client/js/components/SearchTypeahead.jsx

@@ -163,7 +163,7 @@ class SearchTypeahead extends React.Component {
     const page = option;
     const page = option;
     return (
     return (
       <span>
       <span>
-        <UserPicture user={page.lastUpdateUser} size="sm" withoutLink />
+        <UserPicture user={page.lastUpdateUser} size="sm" noLink />
         <PagePath page={page} />
         <PagePath page={page} />
         <PageListMeta page={page} />
         <PageListMeta page={page} />
       </span>
       </span>

+ 7 - 7
src/client/js/components/User/UserPicture.jsx

@@ -78,11 +78,11 @@ export default class UserPicture extends React.Component {
       return this.renderForNull();
       return this.renderForNull();
     }
     }
 
 
-    const { withoutLink, withoutTooltip } = this.props;
+    const { noLink, noTooltip } = this.props;
 
 
     // determine RootElm
     // determine RootElm
-    let RootElm = withoutLink ? this.RootElmWithoutLink : this.RootElmWithLink;
-    if (!withoutTooltip) {
+    let RootElm = noLink ? this.RootElmWithoutLink : this.RootElmWithLink;
+    if (!noTooltip) {
       RootElm = this.withTooltip(RootElm);
       RootElm = this.withTooltip(RootElm);
     }
     }
 
 
@@ -102,12 +102,12 @@ export default class UserPicture extends React.Component {
 UserPicture.propTypes = {
 UserPicture.propTypes = {
   user: PropTypes.object,
   user: PropTypes.object,
   size: PropTypes.string,
   size: PropTypes.string,
-  withoutLink: PropTypes.bool,
-  withoutTooltip: PropTypes.bool,
+  noLink: PropTypes.bool,
+  noTooltip: PropTypes.bool,
 };
 };
 
 
 UserPicture.defaultProps = {
 UserPicture.defaultProps = {
   size: null,
   size: null,
-  withoutLink: false,
-  withoutTooltip: false,
+  noLink: false,
+  noTooltip: false,
 };
 };