Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to activity display in case timeline #10281

Merged
merged 4 commits into from
May 1, 2017
Merged

Conversation

agh1
Copy link
Contributor

@agh1 agh1 commented Apr 29, 2017

Two issues when editing a case timeline:

  • options for reference activities were not displaying per CRM-20478
  • activity types and statuses were displaying names, not labels--they weren't translated at all

@@ -391,5 +397,6 @@
});
};
});
// console.log($scope.)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kill this

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

gone!

@eileenmcnaughton
Copy link
Contributor

@colemanw one for you to review?

@agh1
Copy link
Contributor Author

agh1 commented Apr 29, 2017

also noticed that "Newest" and "Oldest" were never translated

@seamuslee001
Copy link
Contributor

@agh1 Andrew test failures look legit

@agh1
Copy link
Contributor Author

agh1 commented May 1, 2017

@seamuslee001 thanks--the test was missing the activity type data for two of the activity types it used. (My changes look up the activity type to find the label.)

@colemanw
Copy link
Member

colemanw commented May 1, 2017

Code looks good, tested it out and was able to reproduce the bug & confirm that this fixes it.

@colemanw colemanw merged commit 84278e4 into civicrm:master May 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants