File tree Expand file tree Collapse file tree 3 files changed +23
-8
lines changed Expand file tree Collapse file tree 3 files changed +23
-8
lines changed Original file line number Diff line number Diff line change 7
7
<member-addition-form
8
8
:add-member =" addMember"
9
9
:items =" items"
10
+ :roles =" roles"
10
11
@close =" slotProps.close"
11
12
@search-user =" searchUser"
12
13
/>
15
16
</template >
16
17
17
18
<script >
18
- import { mapActions } from ' vuex'
19
+ import { mapActions , mapGetters } from ' vuex'
19
20
import BaseModal from ' @/components/molecules/BaseModal'
20
21
import MemberAdditionForm from ' @/components/organisms/members/MemberAdditionForm'
21
22
import UserService from ' @/services/user.service'
@@ -32,8 +33,17 @@ export default {
32
33
}
33
34
},
34
35
36
+ computed: {
37
+ ... mapGetters (' roles' , [' roles' ])
38
+ },
39
+
40
+ created () {
41
+ this .getRoleList ()
42
+ },
43
+
35
44
methods: {
36
45
... mapActions (' members' , [' addMember' ]),
46
+ ... mapActions (' roles' , [' getRoleList' ]),
37
47
38
48
searchUser (username ) {
39
49
UserService .getUserList (username)
Original file line number Diff line number Diff line change 17
17
:items =" items"
18
18
:loading =" isLoading"
19
19
:search-input.sync =" username"
20
- :rules =" userNameRules"
21
20
color =" white"
22
21
hide-no-data
23
22
hide-selected
31
30
v-model =" role"
32
31
:items =" roles"
33
32
:rules =" roleRules"
33
+ item-text =" name"
34
+ item-value =" id"
34
35
label =" Role"
36
+ return-object
35
37
prepend-icon =" mdi-account-card-details-outline"
36
38
/>
37
39
</v-form >
41
43
42
44
<script >
43
45
import BaseCard from ' @/components/molecules/BaseCard'
44
- import { userNameRules , roleRules } from ' @/rules/index'
46
+ import { roleRules } from ' @/rules/index'
45
47
46
48
export default {
47
49
components: {
@@ -57,6 +59,11 @@ export default {
57
59
type: Array ,
58
60
default : () => {},
59
61
required: true
62
+ },
63
+ roles: {
64
+ type: Array ,
65
+ default : () => {},
66
+ required: true
60
67
}
61
68
},
62
69
data () {
@@ -66,8 +73,6 @@ export default {
66
73
role: null ,
67
74
isLoading: false ,
68
75
selectedUser: null ,
69
- roles: [' Admin' , ' Member' ],
70
- userNameRules,
71
76
roleRules
72
77
}
73
78
},
@@ -93,7 +98,7 @@ export default {
93
98
this .addMember ({
94
99
userId: this .selectedUser .id ,
95
100
projectId: this .$route .params .id ,
96
- role: this .role
101
+ role: this .role . id
97
102
})
98
103
this .reset ()
99
104
this .cancel ()
Original file line number Diff line number Diff line change @@ -9,9 +9,9 @@ class MemberService {
9
9
return this . request . get ( `/projects/${ projectId } /roles` )
10
10
}
11
11
12
- addMember ( projectId , userId , role ) {
12
+ addMember ( projectId , user , role ) {
13
13
const data = {
14
- id : userId ,
14
+ user ,
15
15
role
16
16
}
17
17
return this . request . post ( `/projects/${ projectId } /roles` , data )
You can’t perform that action at this time.
0 commit comments