Download as
Browse Code »

Commit 3c3870cc9590ccf22d15c6d80a228fcb88fa576d

Authored by Ábner Oliveira
1 parent 1af26816
Exists in master and in 15 other branches cosmetic_changes_people_and_communities_block, edit-blocks, forgot_password, layout_support, login_modal, login_modal_improve, profile-article-resolvers, profile-blocks-sass, profile_description_block_component, profile_page_improvements, recent-activities, staging, theme-skin-yellow, translations, users_profile_page

fixed issue when removing comment with replies

Showing 3 changed files with 19 additions and 6 deletions   Show diff stats
src/app/article/comment/comments.component.ts
  Diff comments   View file @3c3870c
... ... @@ -34,6 +34,17 @@ export class CommentsComponent {
34 34  
35 35 commentAdded(comment: noosfero.CommentViewModel): void {
36 36 comment.__show_reply = false;
  37 + if (comment.reply_of) {
  38 + this.comments.forEach((commentOnList) => {
  39 + if (commentOnList.id == comment.reply_of.id) {
  40 + if (commentOnList.replies) {
  41 + commentOnList.replies.push(comment);
  42 + } else {
  43 + commentOnList.replies = [comment];
  44 + }
  45 + }
  46 + });
  47 + }
37 48 this.comments.push(comment);
38 49 this.resetShowReply();
39 50 this.$scope.$apply();
... ...
src/lib/ng-noosfero-api/http/restangular_service.ts
  Diff comments   View file @3c3870c
... ... @@ -223,7 +223,7 @@ export abstract class RestangularService<T extends noosfero.RestModel> {
223 223 restRequest = restangularObj.remove(queryParams, headers);
224 224  
225 225 restRequest
226   - .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter))
  226 + .then(this.getHandleSuccessFunction(deferred, this.modelRemovedEventEmitter, obj))
227 227 .catch(this.getHandleErrorFunction(deferred));
228 228  
229 229 return deferred.promise;
... ... @@ -311,7 +311,7 @@ export abstract class RestangularService<T extends noosfero.RestModel> {
311 311 }
312 312  
313 313 /** HANDLERS */
314   - protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C | T | any>>, successEmitter: EventEmitter<T> = null): (response: restangular.IResponse) => void {
  314 + protected getHandleSuccessFunction<C>(deferred: ng.IDeferred<noosfero.RestResult<C | T | any>>, successEmitter: EventEmitter<T> = null, currentModel: T = null): (response: restangular.IResponse) => void {
315 315 let self = this;
316 316  
317 317 /**
... ... @@ -328,7 +328,11 @@ export abstract class RestangularService&lt;T extends noosfero.RestModel&gt; {
328 328 deferred.resolve(resultModel);
329 329 // emits the event if a successEmiter was provided in the successEmitter parameter
330 330 if (successEmitter !== null) {
331   - successEmitter.next(resultModel.data);
  331 + if (successEmitter !== this.modelRemovedEventEmitter) {
  332 + successEmitter.next(resultModel.data);
  333 + } else {
  334 + successEmitter.next(currentModel !== null ? currentModel : resultModel.data);
  335 + }
332 336 }
333 337 };
334 338 return successFunction;
... ...
src/plugins/comment_paragraph/allow-comment/allow-comment.component.ts
  Diff comments   View file @3c3870c
... ... @@ -36,14 +36,12 @@ export class AllowCommentComponent {
36 36 this.commentService.subscribeToModelAdded((comment: noosfero.CommentParagraph) => {
37 37 if (comment.paragraph_uuid === this.paragraphUuid) {
38 38 this.commentsCount += 1;
39   - this.$scope.$apply();
40 39 };
41 40 });
42 41  
43 42 this.commentService.subscribeToModelRemoved((comment: noosfero.CommentParagraph) => {
44 43 if (comment.paragraph_uuid === this.paragraphUuid) {
45   - this.commentsCount -= 1;
46   - this.$scope.$apply();
  44 + this.commentsCount -= (comment.replies) ? 1 + comment.replies.length : 1;
47 45 };
48 46 });
49 47 }
... ...