Skip to content

Ticket #1498 - Conflict detection and resolution + use wp.editPost instead of metaWeblog.editPost #10

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
Closed
wants to merge 32 commits into from
Closed

Ticket #1498 - Conflict detection and resolution + use wp.editPost instead of metaWeblog.editPost #10

wants to merge 32 commits into from

Conversation

@maxme
Copy link
Contributor

@maxme maxme commented Jul 16, 2013

This branch adds:

  • conflict detection code on Posts
  • a RevisionSelector view to compare N post revisions (it's used here with the only 2 conflicted revisions)
  • switch calls to metaWeblog.editPost with wp.editPost and metaWeblog.newPost with wp.newPost
  • date_modified_gmt in BasePost data model

Known issues:

  • A user can edit tags/categories but he can't remove all tags (or categories) from a Post.
  • wp.getPage doesn't reply with date_modified_gmt so currently RevisionSelector is not plugged in PagesViewController.

koke and others added 30 commits June 18, 2013 10:24
@koke
Merge branch 'release/3.6.1'
7b51e5e
@koke
Merge branch 'release/3.6.2'
7a80135
@koke
Merge branch 'release/3.6.3'
bea2667
@maxme
add date_modified_gmt field to Post and Page models - used for confli…
3ecab4c 
…ct detection and revision presentation
@maxme
Conflict detection on AbstractPost upload
75f1bf1
@maxme
new subview: RevisionView
d06d19b
@maxme
minor additions to models Page and Post (set .author to wp_author_dis…
6eef078 
…play_name)
@maxme
init a _RevisionSelector_ draft for iPhone
162bc36
@maxme
plug the conflict detector and revision browser in EditPostViewContro…
9633989 
…ller
@maxme
- "Use" revision button works
c9afd0a 
- now display local date in revision view
- localization
@maxme
improve RevisionView styling
3afd286
@maxme
fix pageControl flickering
7092c53
@maxme
present RevisionSelector as a modal view instead of pushing it in nav…
1905319 
…igationController, fix localization for 'by [author]', and better upload handling
@maxme
Cleaning, add comments and marks
3dc73ee
@maxme
change background from sidebar_bg to dark gray
b6c9b12
@maxme
do a wp.editPost request with _if_not_modified_since_ option to check…
c72396d 
… for a conflict instead of fetching the full post

cleaning
@maxme
Use wp.editPost directly to check for a conflict
ce0c67c
@maxme
plug alternative conflict detection in EditPostViewController
3971e3c
@maxme
create new CoreData model (v.12) and set it as current - (and rollbac…
b3cdf12 
…k v.11 from master)
@maxme
cleanup
80d49a8
@maxme
replace metaWeblog.editPost with wp.editPost
d1d94cd
@maxme
- add an activity indicator and refactor updateLayout
dda912c 
- call to layoutIfNeeded instead of layoutSubviews
- remove "Conflict Detected" AlertView
- remove author label from RevisionView
@maxme
plug RevisionSelector in PostsViewController
34051d3
@maxme
Merge branch 'develop' into ticket-1498-wp.editPost
e5dd9c2 
Conflicts:
	WordPress/Classes/AbstractPost.h
	WordPress/Classes/AbstractPost.m
	WordPress/Classes/Page.m
	WordPress/Classes/Post.m
	WordPress/Classes/WordPress.xcdatamodeld/WordPress 12.xcdatamodel/elements
	WordPress/Classes/WordPress.xcdatamodeld/WordPress 12.xcdatamodel/layout
	WordPress/WordPress.xcodeproj/project.pbxproj
@maxme
fix merge error
d4336d0
@maxme
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
428ae79 
…ss-iOS into ticket-1498-wp.editPost
@maxme
use terms_names field to post Categories and Tags using wp.editPost
fa6160b
@maxme
set AbstractPostRemoteStatusSync after wp.editPost->wp.getPost
5ece688
@maxme
hide Pager in RevisionSelector when pageNumber <= 1
c12c696
@maxme
delete unused revisions when RevisionSelector is canceled
e232397
koke
koke reviewed Jul 16, 2013
View reviewed changes
WordPress/Classes/BasePost.h
Copy link
Member

@koke koke Jul 16, 2013

Choose a reason for hiding this comment

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

This looks like it's going to break for existing installs: Local drafts will turn into conflicts and synced posts will turn into local drafts

Copy link
Contributor Author

@maxme maxme Jul 17, 2013

Choose a reason for hiding this comment

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

Migration is done in commit b5876bb

@koke koke mentioned this pull request Oct 7, 2013
Closed
@autobott
Copy link

autobott commented Nov 7, 2013

Build triggered.

@koke koke mentioned this pull request Nov 12, 2013
Closed
@sendhil
Copy link
Contributor

sendhil commented Dec 21, 2013

I'm going to close this for now, we can always re-visit this later.

@sendhil sendhil closed this Dec 21, 2013
@etoledom etoledom mentioned this pull request Jun 19, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Someday

Development

Successfully merging this pull request may close these issues.

4 participants

@maxme @autobott @sendhil @koke