Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
workbiu-admin
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gxx
workbiu-admin
Commits
cc2beae6
Commit
cc2beae6
authored
Nov 09, 2017
by
gxx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
团队页面修改
parent
1db4632b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
6 deletions
+3
-6
GroupController.php
app/Http/Controllers/GroupController.php
+0
-4
groupinformation.blade.php
resources/views/admin/group/groupinformation.blade.php
+1
-0
invite.blade.php
resources/views/admin/group/invite.blade.php
+2
-2
No files found.
app/Http/Controllers/GroupController.php
View file @
cc2beae6
...
@@ -172,7 +172,6 @@ class GroupController extends Controller
...
@@ -172,7 +172,6 @@ class GroupController extends Controller
public
function
simpleSearchUser
(
$search
)
public
function
simpleSearchUser
(
$search
)
{
{
$user
=
$this
->
mGroup
->
getUser
(
$search
);
$user
=
$this
->
mGroup
->
getUser
(
$search
);
if
(
$user
){
if
(
$user
){
return
$user
;
return
$user
;
}
else
{
}
else
{
...
@@ -194,11 +193,8 @@ class GroupController extends Controller
...
@@ -194,11 +193,8 @@ class GroupController extends Controller
$group_id
=
$request
->
group_id
;
$group_id
=
$request
->
group_id
;
$inviteResult
=
$this
->
mGroup
->
invite
(
$group_id
,
$user_id
);
$inviteResult
=
$this
->
mGroup
->
invite
(
$group_id
,
$user_id
);
if
(
$inviteResult
){
if
(
$inviteResult
){
return
Message
::
makeSuccess
(
'邀请成功!'
);
return
Message
::
makeSuccess
(
'邀请成功!'
);
}
else
{
}
else
{
return
Message
::
makeError
(
'你邀请过了吧!'
);
return
Message
::
makeError
(
'你邀请过了吧!'
);
}
}
...
...
resources/views/admin/group/groupinformation.blade.php
View file @
cc2beae6
...
@@ -58,6 +58,7 @@
...
@@ -58,6 +58,7 @@
<
li
class
=
"active"
><
a
href
=
"#activity"
data
-
toggle
=
"tab"
>
团队成员
</
a
></
li
>
<
li
class
=
"active"
><
a
href
=
"#activity"
data
-
toggle
=
"tab"
>
团队成员
</
a
></
li
>
<
li
><
a
href
=
"#timeline"
data
-
toggle
=
"tab"
>
Timeline
</
a
></
li
>
<
li
><
a
href
=
"#timeline"
data
-
toggle
=
"tab"
>
Timeline
</
a
></
li
>
<
li
><
a
href
=
"#settings"
data
-
toggle
=
"tab"
>
Settings
</
a
></
li
>
<
li
><
a
href
=
"#settings"
data
-
toggle
=
"tab"
>
Settings
</
a
></
li
>
<
li
><
a
href
=
"{{route('group.invitePage',['group_id' =>
$groups->id
])}}"
>
邀请新成员
</
a
></
li
>
</
ul
>
</
ul
>
<
div
class
=
"tab-content"
style
=
"height: 740px"
>
<
div
class
=
"tab-content"
style
=
"height: 740px"
>
...
...
resources/views/admin/group/invite.blade.php
View file @
cc2beae6
...
@@ -23,8 +23,8 @@
...
@@ -23,8 +23,8 @@
<
input
type
=
"hidden"
name
=
"id"
value
=
""
>
<
input
type
=
"hidden"
name
=
"id"
value
=
""
>
</
div
>
</
div
>
<
p
style
=
"color: green; display: none"
id
=
"pp1"
>*
用户存在可以邀请加入
</
p
>
<
p
style
=
"color: green; display: none"
id
=
"pp1"
>*
用户存在可以邀请加入
</
p
>
<
input
type
=
"
text
"
id
=
"user_id"
value
=
""
name
=
"user_id"
>
<
input
type
=
"
hidden
"
id
=
"user_id"
value
=
""
name
=
"user_id"
>
<
input
type
=
"
text
"
name
=
"group_id"
value
=
"
{
{$group_id}
}
"
>
<
input
type
=
"
hidden
"
name
=
"group_id"
value
=
"
{
{$group_id}
}
"
>
</
div
>
</
div
>
<!--
/.
box
-
body
-->
<!--
/.
box
-
body
-->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment