Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r488701987d2200568421ecdb409bd25b3aca4d8e -rc7988c968d0e6659c8a6d006d6fb63eff2c02c67 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 488701987d2200568421ecdb409bd25b3aca4d8e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision c7988c968d0e6659c8a6d006d6fb63eff2c02c67) @@ -428,8 +428,8 @@ public LessonDTO getLessonData() { return new LessonDTO(this.lessonId, - this.getLearningDesign().getTitle(), - this.getLearningDesign().getDescription(), + this.getLessonName(), + this.getLessonDescription(), this.lessonStateId); } } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java =================================================================== diff -u -r488701987d2200568421ecdb409bd25b3aca4d8e -rc7988c968d0e6659c8a6d006d6fb63eff2c02c67 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java (.../LessonDTO.java) (revision 488701987d2200568421ecdb409bd25b3aca4d8e) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java (.../LessonDTO.java) (revision c7988c968d0e6659c8a6d006d6fb63eff2c02c67) @@ -42,8 +42,8 @@ // attributes //--------------------------------------------------------------------- private Long lessonId; - private String lessonTitle; - private String learningDesignDescription; + private String lessonName; + private String lessonDescription; private Integer lessonStateId; //--------------------------------------------------------------------- @@ -53,26 +53,26 @@ * Full constructor */ public LessonDTO(Long lessonId, - String learningDesignTitle, - String learningDesignDescription, + String lessonName, + String lessonDescription, Integer lessonStateId) { this.lessonId = lessonId; - this.lessonTitle = learningDesignTitle; - this.learningDesignDescription = learningDesignDescription; + this.lessonName = lessonName; + this.lessonDescription = lessonDescription; this.lessonStateId = lessonStateId; } //--------------------------------------------------------------------- // Getters //--------------------------------------------------------------------- /** - * Returns the learning design description that current lesson is based on. + * Returns the lesson description. * @return Returns the description. */ - public String getLearningDesignDescription() + public String getLessonDescription() { - return learningDesignDescription; + return lessonDescription; } /** * Returns the lesson id. @@ -92,11 +92,11 @@ return lessonStateId; } /** - * Returns the learning design title that current lesson is based on. + * Returns the name of the lesson.. * @return Returns the title. */ - public String getLearningDesignTitle() + public String getLessonName() { - return lessonTitle; + return lessonName; } }