Skip to content

Commit bd885fa

Browse files
Resolução do Problema com Joins ao carregar membros disponiveis
1 parent 8d1829e commit bd885fa

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

application/models/TeamMemberModel.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public function searchAllTeamsOfMember($member_id){
4242
public function searchAvailableMembersForThisTeam($team_id, $id_user){
4343
$this->db->select('name, photo, id_user');
4444
$this->db->where('id_user!=', $id_user);
45-
$this->db->where('member_id is null');
46-
$this->db->join('tb_user', 'id_user = member_id', 'right');
45+
$this->db->where("(member_id IS NULL || team_id!='$team_id')");
46+
$this->db->join('tb_user', 'id_user = member_id', 'RIGHT OUTER');
4747
$this->db->from($this->table);
4848

4949

assets/materialloginform/style.css

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,18 +164,19 @@ body {
164164
position: relative;
165165
background: #ffffff;
166166
border-radius: 5px;
167-
padding: 60px 0 40px 0;
167+
padding: 60px 5px 40px 5px;
168168
box-sizing: border-box;
169169
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24);
170170
-webkit-transition: .3s ease;
171171
transition: .3s ease;
172-
padding: 10px;
172+
/*padding: 10px;*/
173173
/* Title */
174174
/* Inputs */
175175
/* Button */
176176
/* Footer */
177177
/* Alt Card */
178178
}
179+
179180
.card:first-child {
180181
background: #fafafa;
181182
height: 10px;

0 commit comments

Comments
 (0)