Fixed webpack config and groups tooltip

Signed-off-by: John Molakvoæ (skjnldsv) <[email protected]>
nextcloud · May 18, 2018 · 3f9f174 · 3f9f174
1 parent 38b1020
commit 3f9f174
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/settings/js/main.js b/settings/js/main.js
diff --git a/settings/js/main.js.map b/settings/js/main.js.map
diff --git a/settings/src/components/userList/userRow.vue b/settings/src/components/userList/userRow.vue
@@ -229,7 +229,8 @@ export default {
 		 * @returns {string}
 		 */
 		formatGroupsTitle(groups) {
-			return groups.map(group => group.name).join(', ');
+			let names = groups.map(group => group.name);
+			return names.slice(2,).join(', ');
 		},
 
 		deleteUser() {

diff --git a/settings/webpack.common.js b/settings/webpack.common.js
@@ -3,9 +3,9 @@ const path = require('path')
 module.exports = {
   entry: './src/main.js',
   output: {
-    path: path.resolve(__dirname, './dist'),
+    path: path.resolve(__dirname, './js'),
     publicPath: '/dist/',
-    filename: 'build.js'
+    filename: 'main.js'
   },
   module: {
     rules: [