Merge branch 'develop' into 'master'

Develop into master

See merge request !10

courses_legacy/accounts/forms.py

@@ -73,7 +73,7 @@ class ProfileEditAdminForm(BaseProfileEditForm):
             'groups' : forms.SelectMultiple(attrs={'class' : 'form-control',
                                                    'size' : 10 })
         }
-        fields = ('username', 'email', 'first_name', 'last_name', 'image',
+        fields = ('username', 'name', 'email', 'first_name', 'last_name', 'image',
                   'groups', 'occupation', 'city', 'site', 'biography',)
 
     def clean(self):
@@ -97,7 +97,6 @@ class ProfileEditAdminForm(BaseProfileEditForm):
     def save(self, commit=True):
         if self.cleaned_data['password1']:
             self.instance.set_password(self.cleaned_data['password1'])
-        import ipdb; ipdb.set_trace()
         return super(ProfileEditAdminForm, self).save(commit=commit)
 
 

courses_legacy/static/js/dashboard/dashboard-controllers.js

@@ -47,8 +47,12 @@
                     $scope.courses = courses.slice(0, 2);
                 });
             });
-            $scope.latest_topics = Topic.query({limit: 8, ordering: '-last_activity_at'})
-
+            try{
+                $scope.latest_topics = Topic.query({limit: 8, ordering: '-last_activity_at'})
+            }
+            catch(err){
+                console.error(err)
+            }
             // Cards.get({
             //         is_certified: 2,
             //         limit: 3

courses_legacy/templates/administration/courses.html

@@ -162,16 +162,16 @@ wrapper-course-lesson
                 <button class="btn btn-link btn-sm show-all"
                         ng-click="loadLessons(course);showLessons=!showLessons"
                         ng-class="showLessons ? 'hide-all': 'show-all'">
-                    <span ng-if="!showLessons">mostrar aulas</span>
-                    <span ng-if="showLessons">esconder aulas</span>
+                    <span ng-if="!showLessons">mostrar etapas</span>
+                    <span ng-if="showLessons">esconder etapas</span>
                 </button>
 
                 <div class="lesson-list" ng-show="showLessons">
                     <div ng-hide="course.lessons.$resolved">
-                        <span>Carregando lista de aulas...</span>
+                        <span>Carregando lista de etapas...</span>
                     </div>
                     <div ng-show="course.lessons.length == 0">
-                        <span>Carregando lista de aulas...</span>
+                        <span>Nao há etapas disponíveis neste espaço formativo</span>
                     </div>
                     <div ng-show="course.lessons">
                         <div class="lesson" ng-repeat="lesson in course.lessons">