# Feature/196, 198, 199 Grouping users

* Fix user-group and user-group-relation model.
* Fix view for admin user-group management page(uncomplete).
* Prepare userGroupCreate form(uncomplete).

lib/form/admin/userGroupCreate.js

@@ -0,0 +1,8 @@
+'use strict';
+
+var form = require('express-form')
+  , field = form.field;
+
+module.exports = form(
+  field('createGroupForm[userGroupName]', '新規グループ名').trim().required()
+);

lib/form/index.js

@@ -27,5 +27,6 @@ module.exports = {
     userInvite: require('./admin/userInvite'),
     slackIwhSetting: require('./admin/slackIwhSetting'),
     slackSetting: require('./admin/slackSetting'),
+    userGroupCreate: require('./admin/userGroupCreate'),
   },
 };

lib/models/index.js

@@ -3,8 +3,8 @@
 module.exports = {
   Page: require('./page'),
   User: require('./user'),
-  UserGroup: require('./userGroup'),
-  UserGroupRelation: require('./userGroupRelation'),
+  UserGroup: require('./user-group'),
+  UserGroupRelation: require('./user-group-relation'),
   Revision: require('./revision'),
   Bookmark: require('./bookmark'),
   Comment: require('./comment'),

lib/models/userGroup.js → lib/models/user-group.js

@@ -2,7 +2,6 @@ module.exports = function(crowi) {
   var debug = require('debug')('crowi:models:userGroup')
     , mongoose = require('mongoose')
     , mongoosePaginate = require('mongoose-paginate')
-    , uniqueValidator = require('mongoose-unique-validator')
     , ObjectId = mongoose.Schema.Types.ObjectId
 
     , USER_GROUP_PUBLIC_FIELDS = '_id image name createdAt'
@@ -14,11 +13,10 @@ module.exports = function(crowi) {
   userGroupSchema = new mongoose.Schema({
     userGroupId: String,
     image: String,
-    name: { type: String, required: true, unique: true },
+    name: { type: String, required: true },
     createdAt: { type: Date, default: Date.now },
   });
   userGroupSchema.plugin(mongoosePaginate);
-  userGroupSchema.plugin(uniqueValidator);
 
 
   // TBD: グループ画像の更新

lib/routes/admin.js

@@ -479,7 +479,7 @@ module.exports = function(crowi, app) {
     UserGroup.findUserGroupsWithPagination({ page: page }, function (err, result) {
       const pager = createPager(result.total, result.limit, result.page, result.pages, MAX_PAGE_LIST);
 
-      return res.render('admin/user_groups', {
+      return res.render('admin/user-groups', {
         userGroups: result.docs,
         pager: pager
       });

lib/views/admin/user_groups.html → lib/views/admin/user-groups.html

@@ -28,7 +28,7 @@
 
   <div class="row">
     <div class="col-md-3">
-      {% include './widget/menu.html' with {current: 'user_group'} %}
+      {% include './widget/menu.html' with {current: 'user-group'} %}
     </div>
 
     <div class="col-md-9">

lib/views/admin/widget/menu.html

@@ -9,7 +9,7 @@
   <li class="{% if current == 'customize'%}active{% endif %}"><a href="/admin/customize"><i class="fa fa-object-group"></i> カスタマイズ</a></li>
   <li class="{% if current == 'notification'%}active{% endif %}"><a href="/admin/notification"><i class="fa fa-bell"></i> 通知設定</a></li>
   <li class="{% if current == 'user'%}active{% endif %}"><a href="/admin/users"><i class="fa fa-user"></i> ユーザー管理</a></li>
-  <li class="{% if current == 'user_group'%}active{% endif %}"><a href="/admin/user-groups"><i class="fa fa-users"></i> グループ管理</a></li>
+  <li class="{% if current == 'user-group'%}active{% endif %}"><a href="/admin/user-groups"><i class="fa fa-users"></i> グループ管理</a></li>
   {% if searchConfigured() %}
   <li class="{% if current == 'search'%}active{% endif %}"><a href="/admin/search"><i class="fa fa-search"></i> 検索管理</a></li>
   {% endif %}