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

# Improve/346 Disable group select-box when the user does not Choose the grant "Only inside the group"
* Change group select UI to React Component.(inprogress...)
* 復帰中

Tatsuya Ise 8 лет назад
Родитель
Сommit
b10181151f
1 измененных файлов с 12 добавлено и 2 удалено
  1. 12 2
      resource/js/app.js

+ 12 - 2
resource/js/app.js

@@ -184,10 +184,20 @@ if (pageEditorOptionsSelectorElem) {
   );
   );
 }
 }
 // render GrantSelector
 // render GrantSelector
-const userRelatedGroups = new UserGroup(crowi.userRelatedGroups);
+const userRelatedGroups = JSON.parse(document.getElementById('user-related-group-data').textContent || '{}', (value) => {
+  return new UserGroup(value);
+})
+const pageGrant = new PageGrant();
 const pageEditorGrantSelectorElem = document.getElementById('page-grant-selector');
 const pageEditorGrantSelectorElem = document.getElementById('page-grant-selector');
 if (pageEditorGrantSelectorElem) {
 if (pageEditorGrantSelectorElem) {
-  const pageGrant = document.getElementById("page-grant").value;
+  pageGrant.grant = document.getElementById("page-grant").value;
+  const grantGroupData = document.getElementById("grant-group").value;
+  if (grantGroupData != null) {
+    grantGroup = new UserGroup();
+    grantGroup.userGroup =
+    pageGrant.grantGroup = new UserGroup();
+
+  }
   ReactDOM.render(
   ReactDOM.render(
     <GrantSelector crowi={crowi}
     <GrantSelector crowi={crowi}
       userRelatedGroups={userRelatedGroups} pageGrant={new PageGrant(pageGrant)}
       userRelatedGroups={userRelatedGroups} pageGrant={new PageGrant(pageGrant)}