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.

Sign up for GitHub

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

Jump to bottom

Custom comments and activities #938

Merged
merged 19 commits into from
Apr 17, 2020
Merged

Custom comments and activities #938

merged 19 commits into from
Apr 17, 2020

Conversation

micahmills
Copy link
Collaborator

Creates custom comment types for each of the items in the Contact Communication Channels.
Adds a comment type selector to the create and update comments.
Adds "comment_type" to the update_comment API endpoint.

@micahmills
removed 2 dt_write_logs in posts.php
838d4d1
@micahmills
setting up addtional comment sections for each communication channel.
12d2b96
@micahmills
basic JS functionality of posting a comment to a custom comment type.…
a178595 
… Style needs to add the comment Type selector
@micahmills
Added a comment type selector below the Comment text area.
f34c548 
I am not 100% pleased with the UI of this yet, but it is functional.
@micahmills
modified the update comment endpoints to accept a comment type like t…
19ab793 
…he create a comment endpoint
@micahmills
modified the update comment endpoints to accept a comment type like t…
7195aeb 
…he create a comment endpoint

We need to update the Wiki to reflect the update Comment API changes.
@micahmills
Merge branch 'Custom-Activities' of github.com:micahmills/disciple-to…
effd397 
…ols-theme into Custom-Activities
@micahmills
added comment type selector to the edit comment page, and changed com…
758bd2a 
…ment type based on that selector changing.
@micahmills
Copy link
Collaborator Author

The remaining question here is one of UI, What do you think of the UI of having a "Type of Comment" Select element below the Comment box?

@micahmills
Copy link
Collaborator Author

Making a note here so I don't forget, when this branch gets merged we need to add

  • comment_type (string) optional. The comment type. Default: 'comment'

to the Update A Comment section of the Wiki

@corsacca
Copy link
Member

This looks cool! :)
For some reason The indent of the 2nd+ comments isn't aligned any more.
image
I'd remove "activity" from the comment type list. Activity messages are generated by the server.

@corsacca
Copy link
Member

corsacca commented Apr 16, 2020 •
edited
Loading

Actually the alignment issue isn't related to this issue PR. So i created #942

@micahmills
Copy link
Collaborator Author

I saw your new issue. Is the alignment issue related to something in this PR or was it there before?

@corsacca
Copy link
Member

It is not related to this PR. I haven't investigated but it looks like it might be something from the translation PR since it breaks alignment after "translate with google".

@micahmills
Copy link
Collaborator Author

I may know what is causing it.

@micahmills
Copy link
Collaborator Author

I’ll fix it in a separate PR

@micahmills
Remove Activity from the comment type selector
a5f2e97
@micahmills
Merge branch 'upstream-master' into Custom-Activities
c2da203 
# Conflicts:
#	dt-assets/build/css/style.min.css
#	dt-assets/build/css/style.min.css.map
corsacca
corsacca reviewed Apr 17, 2020
View reviewed changes
dt-posts/dt-posts.php Outdated Show resolved Hide resolved
corsacca
corsacca reviewed Apr 17, 2020
View reviewed changes
dt-assets/js/comments.js Outdated Show resolved Hide resolved
@corsacca
Copy link
Member

We'll need to also remove the Activity option from the edit modal.

@corsacca
Copy link
Member

@micahmills please test :)

micahmills
micahmills commented Apr 17, 2020
View reviewed changes
Copy link
Collaborator Author

@micahmills micahmills left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I am not 100% certain that the change on dt-post-endpoints.php:493 won't break other places that use this function, but since the $check_permissions arg is defaulted to true, in dt-post.php 683 I assumed I could set it to true here as well.

corsacca
corsacca approved these changes Apr 17, 2020
View reviewed changes
Copy link
Member

@corsacca corsacca left a comment

Choose a reason for hiding this comment

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

Looks great :)

@corsacca corsacca added this to the 0.28 milestone Apr 17, 2020
@corsacca corsacca merged commit 4b6f624 into DiscipleTools:master Apr 17, 2020
@corsacca
Copy link
Member

Thank you @micahmills !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corsacca corsacca corsacca approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.28
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@micahmills @corsacca