Merge remote-tracking branch 'upstream/release-1.12' into sb-8586-fil…

…ter-enhancement
Sunbird-Ed · Dec 7, 2018 · 515a104 · 515a104
2 parents 0b183ed + 8af8838
commit 515a104
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 10 deletions.
diff --git a/src/app/client/src/app/modules/public/module/course/components/course/course.component.html b/src/app/client/src/app/modules/public/module/course/components/course/course.component.html
@@ -26,7 +26,7 @@
       <div class="header cardsHeading">{{resourceService?.frmelmnts?.lbl?.signinenrollTitle}} </div>
       <br/>
       <div class="announcement-description">
-        {{resourceService?.frmelmnts?.lbl?.signinenrollHeader}}
+        <!-- {{resourceService?.frmelmnts?.lbl?.signinenrollHeader}} -->
       </div>
       <a href={{baseUrl}} class ="ui button primary announcement-button close mt-20" >{{resourceService.frmelmnts?.btn?.signin}}</a> 
     </div>

diff --git a/.../app/modules/public/module/course/components/explore-course/explore-course.component.html b/.../app/modules/public/module/course/components/explore-course/explore-course.component.html
@@ -64,7 +64,7 @@ <h5 appTelemetryInteract [telemetryInteractEdata]="closeIntractEdata" class="ui
         <div class="header cardsHeading">{{resourceService.frmelmnts?.lbl?.signinenrollTitle}} </div>
         <br/>
         <div class="announcement-description">
-            {{resourceService.frmelmnts?.lbl?.signinenrollHeader}}
+            <!-- {{resourceService.frmelmnts?.lbl?.signinenrollHeader}} -->
         </div>
         <a href={{baseUrl}} class ="ui button primary announcement-button close mt-20" >{{resourceService.frmelmnts?.btn?.signin}}</a> 
       </div>

diff --git a/...rc/app/modules/public/module/course/components/explore-course/explore-course.component.ts b/...rc/app/modules/public/module/course/components/explore-course/explore-course.component.ts
@@ -279,6 +279,7 @@ export class ExploreCourseComponent implements OnInit, OnDestroy {
                     this.pageNumber = Number(bothParams.params.pageNumber);
                 }
                 this.queryParams = { ...bothParams.queryParams };
+                this.filters = {};
                 if (!_.isEmpty(this.queryParams)) {
                     _.forOwn(this.queryParams, (queryValue, queryParam) => {
                         this.filters[queryParam] = queryValue;
@@ -328,7 +329,7 @@ export class ExploreCourseComponent implements OnInit, OnDestroy {
         this.filters = {};
         this.dataDrivenFilter = {};
         this.filterType = this.config.appConfig.exploreCourse.filterType;
-        this.redirectUrl = this.config.appConfig.course.searchPageredirectUrl;
+        this.redirectUrl = this.config.appConfig.exploreCourse.searchPageredirectUrl;
         this.slug = this.activatedRoute.snapshot.params.slug;
         this.getChannelId();
         this.getframeWorkData();

diff --git a/...pp/client/src/app/modules/public/module/explore/components/explore/explore.component.html b/...pp/client/src/app/modules/public/module/explore/components/explore/explore.component.html
@@ -27,7 +27,7 @@
       <div class="header cardsHeading">{{resourceService.frmelmnts?.lbl?.signinenrollTitle}} </div>
       <br/>
       <div class="announcement-description">
-          {{resourceService.frmelmnts?.lbl?.signinenrollHeader}}
+          <!-- {{resourceService.frmelmnts?.lbl?.signinenrollHeader}} -->
       </div>
       <br/>
       <br/>

diff --git a/src/app/client/src/app/modules/shared-feature/components/view-all/view-all.component.html b/src/app/client/src/app/modules/shared-feature/components/view-all/view-all.component.html
@@ -56,7 +56,7 @@ <h5 appTelemetryInteract [telemetryInteractEdata]="closeIntractEdata" class="ui
         <div class="header cardsHeading">{{resourceService?.frmelmnts?.lbl?.signinenrollTitle}} </div>
         <br/>
         <div class="announcement-description">
-          {{resourceService?.frmelmnts?.lbl?.signinenrollHeader}}
+          <!-- {{resourceService?.frmelmnts?.lbl?.signinenrollHeader}} -->
         </div>
         <br/>
         <br/>

diff --git a/...les/workspace/components/content-editors/collection-editor/collection-editor.component.ts b/...les/workspace/components/content-editors/collection-editor/collection-editor.component.ts
@@ -170,7 +170,7 @@ export class CollectionEditorComponent implements OnInit, OnDestroy {
         id: 'org.ekstep.suggestcontent',
         ver: '1.1',
         type: 'plugin'
-      },{
+      }, {
         id: 'org.ekstep.uploadfile',
         ver: '1.0',
         type: 'plugin'

diff --git a/...lient/src/app/modules/workspace/components/review-comments/review-comments.component.scss b/...lient/src/app/modules/workspace/components/review-comments/review-comments.component.scss
@@ -4,7 +4,7 @@
     max-height: calc(100% - 4px);
     position: absolute;
     top: 15px;
-    bottom: 15px;
+    bottom: 18px;
     left: 15px;
     right: 15px;	
 }
@@ -56,4 +56,4 @@ textarea:focus+i.icon.sb-icon-send:before {
 }
 .placeholder{
     height:100%;
-}
+}
diff --git a/src/app/resourcebundles/data/consumption/en.properties b/src/app/resourcebundles/data/consumption/en.properties
@@ -258,7 +258,7 @@ frmelmnts.lbl.viewless=View less
 frmelmnts.lbl.trainingAttended=Trainings attended
 frmelmnts.lbl.block=Block
 frmelmnts.lbl.signinenrollTitle=Sign in to enroll in this course
-frmelmnts.lbl.signinenrollHeader= Courses are for registred users. Sign in to access the course. 
+frmelmnts.lbl.signinenrollHeader= Courses are for registered users. Sign in to access the course. 
 frmelmnts.lbl.district=District
 frmelmnts.lbl.topic=Topic
 frmelmnts.lbl.subtopic=Subtopic

diff --git a/src/app/resourcebundles/json/en.json b/src/app/resourcebundles/json/en.json