Merge branch 'develop' into 'master'

Develop

See merge request !7

courses_legacy/static/templates/activity_discussion.html

@@ -90,10 +90,10 @@
             <h3 class="title" ng-show="my_answer">Sua atividade:</h3>
             <div class="forum-thread" ng-cloak>
                 <div class="user-icon">
-                    <img src="{{ topic.author.image || '/static/img/avatar-default.png'}}" alt="{{ topic.author.name }}">
+                    <img src="{{ topic.author.image || '/static/img/avatar-default.png'}}" alt="{{ topic.author.name || topic.author.username }}">
                 </div>
                 <div class="info">
-                    <h4 class="thread-header pull-left">por <span class="user-name">{{topic.author.name}}</span> <span class="last-edit">última edição: {{topic.updated_at | date : 'dd/MM/yyyy'}}</span></h4>
+                    <h4 class="thread-header pull-left">por <span class="user-name">{{topic.author.name || topic.author.username}}</span> <span class="last-edit">última edição: {{topic.updated_at | date : 'dd/MM/yyyy'}}</span></h4>
 
                     <button class="btn btn-sm btn-success edit pull-right" ng-click="show_edit()" ng-show="my_answer" ng-style="{'visibility': (!activity_expired && currentActivity.data.editable) ? 'visible' : 'hidden'}">editar</button>
 
@@ -153,7 +153,7 @@
                         </div>
                         <div class="info">
                             <span class="user-name">
-                              <a ng-href="/profile/{{ comment.author.username }}">{{ comment.author.name }}</a>
+                              <a ng-href="/profile/{{ comment.author.username }}">{{ comment.author.name || comment.author.username}}</a>
                             </span>
                             <div class="comment-post" ng-if="!comment.updating">
                                 <div ng-bind-html="get_as_safe_html(comment.text)"></div>
@@ -204,7 +204,7 @@
                             <div class="info">
                                 <div ng-show="!reply.updating">
                                     <span class="user-name">
-                                      <a ng-href="/profile/{{ reply.author.username }}">{{ reply.author.name }}</a>
+                                      <a ng-href="/profile/{{ reply.author.username }}">{{ reply.author.name || reply.author.username }}</a>
                                     </span>
                                     <div class="comment-post">
                                         <div ng-bind-html="get_as_safe_html(reply.text)"></div>

courses_legacy/templates/class_edit.html

@@ -89,13 +89,15 @@ wrapper-course-lesson
 
         <div class="professor-assistant">
             <label for="{{ form.assistant.id_for_label }}">Professor Assistente:</label>
+            <p>{{$class.course.professors}}</p>
             {% if user|is_course_coordinator:object.course %}
                 {% verbatim %}
                 <span class="help-text"><i class="fa fa-caret-down" aria-hidden="true"></i> Escolha o professor assistente</span>
                 <ui-select multiple ng-model="classe.assistants" theme="bootstrap" title="Escolha os professores...">
-                    <ui-select-match placeholder="Escolha os professores...">{{$item.first_name + " " + $item.last_name}}</ui-select-match>
+                    <ui-select-match placeholder="Escolha os professores...">{{$item}}</ui-select-match>
                     <ui-select-choices repeat="professor in classe.course.professors" group-by="">
-                        <div ng-bind-html="professor.first_name+' '+professor.last_name | highlight: $select.search"></div>
+                        <div ng-></div>
+                        <div ng-bind-html="professor.id+' '+professor.id | highlight: $select.search"></div>
                     </ui-select-choices>
                 </ui-select>
                 {% endverbatim %}

courses_legacy/templates/forum-embed.html

@@ -61,10 +61,10 @@
 
             <div class="user-update column" ng-repeat="topic in latest_topics">
                 <div class="user-icon">
-                    <img ng-src="{{topic.author.picture}}" alt="{{topic.author.first_name}}" />
+                    <img ng-src="{{topic.author.picture}}" alt="{{topic.author.first_name || topic.author.username }}" />
                 </div>
                 <div class="info">
-                    <a ng-href="/profile/{{ topic.author.username }}"><b>{{topic.author.first_name}}</b></a> comentou no tópico <a ng-href="/discussion/topic/#!/topic/{{topic.id}}/" class="thread-name">{{topic.title | charLimiter:50}}</a>
+                    <a ng-href="/profile/{{ topic.author.username }}"><b>{{topic.author.first_name || topic.author.username }}</b></a> comentou no tópico <a ng-href="/discussion/topic/#!/topic/{{topic.id}}/" class="thread-name">{{topic.title | charLimiter:50}}</a>
                     no fórum <a ng-href="/discussion/#!/forum/{{ topic.forum }}">{{topic.forum_info.title}}</a></span>
                 </div>
                 <div class="actions">

courses_legacy/templates/forum-topic.html

@@ -33,8 +33,6 @@
                     <h2 class="title" ng-cloak><a class="forum-header-link" href="/discussion/#!/">Fóruns</a> > <a class="forum-header-link" ng-href="/discussion/#!/forum/{{ topic.forum }}">{{ topic.forum_info.title }}</h2>
                 </div>
                 <div ng-show="!fatal_error" class="pull-right hidden-xs">
-                    <a class="btn btn-sm btn-success new-topic"
-                   href="/discussion/topic/new/#!/topic/new/">criar novo tópico</a>
                     <a ng-href="/discussion/#!/forum/{{ topic.forum }}" class="btn btn-link goback"><span>voltar</span></a>
                 </div>
                 <div ng-show="!fatal_error" class="pull-right dropdown visible-xs">
@@ -140,7 +138,7 @@
                           <img ng-src="{{topic.author.image || '/static/img/avatar-default.png'}}" alt="{{ topic.author.name }}">
                       </div>
                       <div class="info">
-                          <h4 class="thread-header"><span class="thread-title">{{ topic.title }}</span> por <a class="user-name" ng-href="/profile/{{ topic.author.username }}">{{ topic.author.name }}</a></h4>
+                          <h4 class="thread-header"><span class="thread-title">{{ topic.title }}</span> por <a class="user-name" ng-href="/profile/{{ topic.author.username }}">{{ topic.author.name || topic.author.username}}</a></h4>
                       </div>
                       <div class="tags">
                           <a class="tag" ng-repeat="category in topic.categories">{{ category.name }}</a>
@@ -208,7 +206,7 @@
                             </div>
                             <div class="info">
                                 <span class="user-name">
-                                  <a ng-href="/profile/{{ comment.author.username }}">{{ comment.author.name }}</a>
+                                  <a ng-href="/profile/{{ comment.author.username }}">{{ comment.author.name || comment.author.username}}</a>
                                 </span>
                                 <div class="comment-post" ng-show="!comment.updating">
                                     <div ng-bind-html="get_as_safe_html(comment.text)"></div>

courses_legacy/templates/forum.html

@@ -107,11 +107,11 @@
         <div class="line two-column fifty-fifty" ng-if="!forum_single && !forum_search">
             <div class="user-update column" ng-repeat="topic in latest_topics">
                 <div class="user-icon">
-                    <img ng-src="{{topic.author.image || '/static/img/avatar-default.png'}}" alt="{{ topic.author.name }}">
+                    <img ng-src="{{topic.author.image || '/static/img/avatar-default.png'}}" alt="{{topic.author.first_name || topic.author.username  }}">
                 </div>
                 <div class="info">
                     <a ng-href="/profile/{{ topic.author.username }}">
-                      <b>{{ topic.author.name }}</b>
+                      <b>{{ topic.author.first_name || topic.author.username }}</b>
                     </a> comentou no tópico <a href="/discussion/topic/#!/topic/{{ topic.id }}" class="thread-name">{{ topic.title |charLimiter:50}}</a> no fórum <a ng-href="/discussion/#!/forum/{{ topic.forum }}">{{ topic.forum_info.title }}</a>
                 </div>
                 <div class="actions">