Преглед изворни кода

new account is active

master
Daniel пре 2 година
родитељ
комит
767558cd6f
3 измењених фајлова са 10 додато и 2 уклоњено
  1. +5
    -0
      src/client/app/css/app.css
  2. +2
    -1
      src/client/app/tmpl/group-terms.html
  3. +3
    -1
      src/server/server/control/TB_Server_Control_Auth.php

+ 5
- 0
src/client/app/css/app.css Прегледај датотеку

@@ -542,6 +542,11 @@ body.body-auth .action-button {
display: block; display: block;
} }
.group-terms {
border-bottom: 1px solid #ccc;
margin-bottom: 15px;
}
.button-like-modal-footer { .button-like-modal-footer {
border-top: 1px solid #e9ecef; border-top: 1px solid #e9ecef;
padding: 0.5rem; padding: 0.5rem;


+ 2
- 1
src/client/app/tmpl/group-terms.html Прегледај датотеку

@@ -19,7 +19,8 @@
<p> <p>
<strong><%= _lc( 'GROUP_TERMS_DESCRIPTION' ) %></strong> <strong><%= _lc( 'GROUP_TERMS_DESCRIPTION' ) %></strong>
</p> </p>
<p><%=raw group.getTermsConditions() ? app.util.Helper.nl2br( group.getTermsConditions() ) : '' %></p>
<div class="group-terms"><p><%=raw group.getTermsConditions() ? app.util.Helper.nl2br( group.getTermsConditions() ) : '' %></p></div>
<% if ( group.getTermsConditionsActive() ) { %> <% if ( group.getTermsConditionsActive() ) { %>
<div class="form-group"> <div class="form-group">
<div class="custom-control custom-checkbox my-1 mr-sm-2"> <div class="custom-control custom-checkbox my-1 mr-sm-2">


+ 3
- 1
src/server/server/control/TB_Server_Control_Auth.php Прегледај датотеку

@@ -708,7 +708,9 @@ class TB_Server_Control_Auth
'team_id' => $team->id, 'team_id' => $team->id,
'role' => TB_Shared_Ent_TeamData_Profile::ROLE_TRAINER, 'role' => TB_Shared_Ent_TeamData_Profile::ROLE_TRAINER,
'is_anonymous' => 0, 'is_anonymous' => 0,
'join_dt' => TB_Server_Utils_Helper::getUTCNowDateTime()
'join_dt' => TB_Server_Utils_Helper::getUTCNowDateTime(),
'status' => TB_Shared_Ent_TeamData_Profile::STATUS_ACTIVE,
'terms_accepted' => 0
)); ));
$profile->teams_js = $teamsJson; $profile->teams_js = $teamsJson;
$profile->save(); $profile->save();


Loading…
Откажи
Сачувај