Просмотр исходного кода

fix GrantSelector when grant=0

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

+ 2 - 2
src/client/js/components/SavePageControls/GrantSelector.jsx

@@ -134,7 +134,7 @@ class GrantSelector extends React.Component {
    */
   renderGrantSelector() {
     const { t } = this.props;
-    const { grantGroup } = this.state;
+    const { grant: currentGrant, grantGroup } = this.state;
 
     let dropdownToggleLabelElm = null;
 
@@ -146,7 +146,7 @@ class GrantSelector extends React.Component {
       const labelElm = <span><i className={`icon icon-fw ${opt.iconClass} ${opt.styleClass}`}></i> <span className={opt.styleClass}>{t(label)}</span></span>;
 
       // set dropdownToggleLabelElm
-      if (this.state.grant === opt.grant) {
+      if (opt.grant === 1 || opt.grant === currentGrant) {
         dropdownToggleLabelElm = labelElm;
       }
 

+ 7 - 0
src/client/styles/scss/_override-bootstrap.scss

@@ -32,3 +32,10 @@
     margin-right: 0.15rem;
   }
 }
+
+// Dropdowns {
+.dropdown {
+  .dropdown-toggle.btn.disabled {
+    cursor: not-allowed;
+  }
+}

+ 0 - 3
src/client/styles/scss/_vendor.scss

@@ -10,9 +10,6 @@
 // import metismenu styles
 @import '~metismenu/dist/metisMenu';
 
-// import bootstrap-select styles
-// @import '~bootstrap-select/sass/bootstrap-select';
-
 // import CodeMirror styles
 @import '~codemirror/lib/codemirror.css';
 @import '~codemirror/theme/elegant.css';