teppo

Module
Version Control

74 posts in this topic

This module is improved and extended successor to Version Control For Text Fields. It handles everything it's predecessor did -- providing basic version control features for page content -- and quite a bit more. Download or clone from GitHub: https://github.com/teppokoivula/VersionControl.

This module requires ProcessWire 2.4.1 or later, mostly because of the file features, which require certain Pagefile and Pageimage methods to be hookable. There's no sensible way around this limitation; for those stuck with < 2.4.1, Version Control For Text Fields will remain a viable option.

What does it do?

While editing pages, fields with old revisions available show up with a new icon in their header bars. By hovering that icon you get a list of available revisions and by clicking any one of those the value of that particular field is reverted to that revision. No changes are made to page until you choose a revision and save the page, which means that you can keep switching between revisions to get an idea what's really changed without inadvertently causing any content to change.

The module also adds a History tab to page edit. This tab opens a view to the history of current page in the form of "revisions" -- each of which is a group of changes to page fields processed during one page save (similar to revisions in various source control applications). There are three actions you can perform on these revisions: adding comments, live previewing what the page might've looked in that revision and restoring the page to specific revision.

One specific feature that has been a big thing for me personally is support for file (and image) fields, as the original version control module felt rather incomplete without it. I'm hoping to take this a lot further performance, stability and feature wise, but as it stands right now, it's already included here and should be fully functional.

Watch the video preview here

I prepared a little screencast outlining most of this: http://youtu.be/AkEt3W7meic. Considering that it was my first screencast ever, I'd like to think that it wasn't that bad.. but I might give it another shot at some point, this time planning a bit before hitting "record"  :)

Upgrading from Version Control For Text Fields

For those already using Version Control For Text Fields, I've added something extra. If you upgrade that module to it's latest version, you should see a new checkbox in it's settings screen saying "Don't drop tables during uninstall". If you check this, uninstall the module and then remove it's files (this is required in order to install Version Control), your old data should be automagically imported to Version Control.

Import has only been tested with limited amounts of demo data. Proper tests are yet to come, so please be careful with this feature!

Update, 21.6.2015: as of today, this module is no longer in beta. While all the regular warnings still apply (making changes, including installing any new modules, on a production site should always be considered risky) Version Control has gone through pretty extensive testing, and should be as stable as any other module out there.

Edited by teppo
Added a note about not being a beta release anymore
32 people like this

Share this post


Link to post
Share on other sites

Very nice and I believe it will be a very useful tool.

1 person likes this

Share this post


Link to post
Share on other sites

Amazing module with impressive ease of use! And really slick and jaw dropping inline-page-version preview!

1 person likes this

Share this post


Link to post
Share on other sites

Huge release! Congratulations Teppo! I love the preview UI, very neat.

2 people like this

Share this post


Link to post
Share on other sites

This is awesome Teppo!

Of course near the end it looks like many versions are created as adding images saves the page behind the scenes via Ajax so that's one way you'll end up with a lot of revisions (did I remember that correctly or make it up?). I'm wondering if it's worth making it so it only stores revisions when updating image and file fields AFTER the Save button is pressed? Or did you already take that into account?

Loving this module and it will be fascinating to see how you handled the image and file fields when I dig into the code :)

3 people like this

Share this post


Link to post
Share on other sites

Thanks guys, really appreciate all the kind words! :)

@Pete: you're right, each AJAX upload creates new revision at the moment. This is difficult to circumvent without sacrificing reliability, but I'll give it some thought.

Since each asynchronous file upload creates separate POST request updating value of given field, it's actually logical that each of those would also create new revision. From technical point of view this is no different than doing something like "$page->title = 'foo'; $page->save('title');" via API, since the end result is exactly same; whether or not user actually realises it, page content changes instantly each time a file has been uploaded.

Anyway, I'll have to see if this could be somehow improved :)

Share this post


Link to post
Share on other sites

I don't see any other way for files really. Maybe bundling multiple (meaning no other changes in between and max few minutes time) additions or removes into same revision. That could be done in UI only.

Share this post


Link to post
Share on other sites

My thinking was simply checking if the input button has been clicked and only creating a revision if $this->input->post->submit_save is present.

Along similar lines, it would be great to have the option of not creating a version of any field until the page is published (no versions for an unpublished page).

Both of these are useful/desirable in some scenarios and not in others so I'm happy for them to be configurable options - as it is the module is already awesome :)

Share this post


Link to post
Share on other sites

@Pete: thanks for both suggestions. I'll have to see if I can find a way to add these without affecting current behaviour negatively and creating unwanted inconsistencies between API and GUI behaviour :)

This is getting slightly off-topic, but as I've been diving into various version and/or source control systems lately, I've started seeing them, first and foremost, as a way to keep track of what really happened, so that you can later review the full chain of events that led to current state and retrace your steps.

That's apparently not how everyone else feels, though. Even Pro Git, which I've been browsing every now and then for ideas as well as Git tips, has an entire chapter titled "Git Tools - Rewriting History", explaining how to alter (prettify, falsify, whatever you call it) local commit history.

I guess it's, in the end, all about finding the right balance between flexibility and consistency :)

Share this post


Link to post
Share on other sites
as a way to keep track of what really happened, so that you can later review the full chain of events that led to current state and retrace your steps.

I hope that you will be able to stay faithful to some type of reliable transactional based version control.  I believe it will play a big part in where and how applications built on this can be deployed.

Anyway, I have always been impressed with your version control module.  Good Luck.

Share this post


Link to post
Share on other sites

Wow! This looks really amazing. Appears that I'll be having lunch at my desk today and testing this out. :)

I really like @pete's suggestions, and @antti's idea of a time interval for bundling. 

Share this post


Link to post
Share on other sites
After a vanilla Processwire 2.4 install, I can't get Version Control module working fully...

Module compatibility is stated as Processwire 2.4 (current stable version).

After Version Control install, Page Snapshot dependancy is not installed and states it requires 2.4.1 minimum.

‘Preview revision’ on the ‘History’ tab gives:

'TemplateFile: Method Page::snapshot does not exist or is not callable in this context'

Upgrading to Processwire 2.4.4 (current dev) allows module and dependancies to install.

‘Preview revision’ on the ‘History’ tab gives:

'TemplateFile: SQLSTATE[HY093]: Invalid parameter number: number of bound variables does not match number of tokens'

and php error:

'Undefined variable: page_ids in site/modules/VersionControl/PageSnapshot.module on line 253'

Version Control 0.9.15 installed. 

Version Control history is enabled for basic-page template.

Any ideas? Have I missed something?

Share this post


Link to post
Share on other sites

@sid: sounds kind of like you could have an earlier version of Page Snapshot module installed. Could please you check that you're running version 1.1.18 of it?

I'm sorry for the confusion about supported ProcessWire version. Dev branch is really needed to run this module. My original post mentioned that the module requires "2.4.1 or later, i.e. current dev branch", but since modules directory doesn't allow submissions unless you define a version ranging from 2.0 to 2.4 as compatible.. well, I can see how that could happen.

Share this post


Link to post
Share on other sites

Thanks for the reply - I have:

Page Snapshot 1.1.18

Process Version Control 0.9.5

Version Control 0.9.15

All 3 PHP errors are:

Undefined variable: page_ids in site/modules/VersionControl/PageSnapshot.module on line 253

Undefined variable: page_ids in site/modules/VersionControl/PageSnapshot.module on line 261

array_merge(): Argument #2 is not an array in site/modules/VersionControl/PageSnapshot.module on line 261

all of which feed into the SQL query missing parameter error when the statement is executed on PageSnapshot.module line 263 I guess?

Share this post


Link to post
Share on other sites

Thanks! There was an issue in PageSnapshot.module preventing it from working properly unless FieldtypeRepeater was installed too.

I've just pushed fix for that to GitHub, so if you could fetch latest version and see if it works any better?

Share this post


Link to post
Share on other sites

Hi teppo, is there a way to get the changes from the api?

$page->currentVersion->typicalFunctions;

$page->previousVersion->typicalFunctions;

I’m looking at implementing a status notification system for a project and this would be handy. For this I would need to grab different fields or a specific one and check for differences using a hook.

Share this post


Link to post
Share on other sites

Sorry for the delayed answer, Pierre-Luc! Been busy with other stuff and this totally slipped my mind.
 
What you've described there wasn't really possible without direct SQL queries until just a few moments ago. I've just pushed to GitHub an update to VersionControl.module (0.10.0) that adds new $page->versionControlRevisions() method. This isn't properly tested yet, but something like this should work:

// current value of field 'headline'
echo "Headline for current revision: {$page->headline}<br />";

// value of field 'headline' in previous revision
$revisions = array_keys($page->versionControlRevisions(2));
$page->snapshot(null, $revisions[1]);
echo "Headline for previous revision: {$page->headline}<br />";

// return Page to it's original (current) state
$page->snapshot();
echo "Back to current revision: {$page->headline}<br />";

Since snapshot() returns Page object to given revision or point in time ($page->snapshot($time, $revision)) you'll want to make sure it's back to it's original state in case you're going to make changes and save the page -- otherwise the revision you fetched with snapshot will be returned from history once you save the page.
 
$page->versionControlRevisions() returns an array of revisions for current page and can optionally take one param, $limit, to fetch only that many revisions if more exist. It's return value is in the form of array([revision] => [timestamp]), i.e. array(4 => '2014-01-01 02:00:00', 3 => '2014-01-01 01:00:00') etc. so in order to get just the revision IDs out of that I'm using array_keys() in the example above.
 
You could probably also do something like this, if you want to make sure that Page doesn't get accidentally returned from history (this'll consume more memory, though):

$revisions = array_keys($page->versionControlRevisions(2));
$page->previousVersion = clone $page;
$page->previousVersion->snapshot(null, $revisions[1]);
echo "Headline for previous revision: {$page->previousVersion->headline}<br />";

Not sure if you're still working on this, but this kind of feature felt useful so I'm glad you brought it up.. :)

6 people like this

Share this post


Link to post
Share on other sites

That’s pretty neat teppo! The feature will be implemented a bit further down the road on this project so it’s far from too late! I’ll let you know when I’ll start playing with it. Awesome, thanks again!

Share this post


Link to post
Share on other sites

ran into a snafu today, here's the setup and behavior:

- Page table field (called reviews)

when adding a review, the review would save but then the field itself wouldn't save so the related page wouldn't be added into the page table and there would be a 500 error;  tried uninstalling various modules, but in the end it came down to this one, when i removed the template from the selected list of templates, the field started saving again; i will try and provide more info, but the errors were not specific to anything other than setting output formatting as false for the the page table field before saving...

Share this post


Link to post
Share on other sites

I just unliked the first post just to like it again. silly.

Sorry Macrura, if that doesn't help with you problem :mellow:

Share this post


Link to post
Share on other sites

@Macrura: if I'm getting this right, you're just adding a page to a PageTable field, and when Version Control is installed, this fails with a 500 error (internal server error). The page (review) itself gets added and saved properly, apparently.

To be clear, which template did you remove from Version Control enabled templates -- the one used for reviews or the one containing the PageTable field? Also, is there anything added to the error logs of Apache or PW?

I was kind of assuming that this module would attempt to store values for the PageTable field itself, which could've easily resulted in an error (don't think that I ever tested that), but since it's not in the supported fields by default, that's unlikely. Unless you've manually added PageTable to the list of supported fields? :)

Any additional info would be helpful. I'll continue testing, but at the moment I'm kind of lost here, and haven't been able to reproduce this issue.

Edit: added PageTable to supported fieldtypes locally. Doesn't work (as expected), but doesn't seem to break anything either. Will continue debugging.

Edited by teppo

Share this post


Link to post
Share on other sites

@teppo - many thanks for replying and sorry for the vagueness of my bug report;

to clarify, yes, there is a page table field where the ajax saving of the field fails when the Version Control is enabled for this template; i only have 3 fields enabled for VC, which are all simple text and body fields.

I removed the template of the containing page from the VC preferences and that allowed the pt field to be saved.

there were errors in the error log (cleared it though), but I'm not sure if they would help, but if so i can re-enable the VC on this template to generate the error if that would help... this site is still in testing, not live, so it's no problem to do that; i can probably get to that later today...

Share this post


Link to post
Share on other sites

there were errors in the error log (cleared it though), but I'm not sure if they would help, but if so i can re-enable the VC on this template to generate the error if that would help... this site is still in testing, not live, so it's no problem to do that; i can probably get to that later today...

Thanks. That would be very helpful (probably), since right now I'm kind of out of ideas here. It's probably something simple, I'm just failing to see what it could be.

Share this post


Link to post
Share on other sites

Create an account or sign in to comment

You need to be a member in order to leave a comment

Create an account

Sign up for a new account in our community. It's easy!


Register a new account

Sign in

Already have an account? Sign in here.


Sign In Now

  • Recently Browsing   0 members

    No registered users viewing this page.

  • Similar Content

    • By bernhard
      Hi,
      just stumbled over a little module that i built for my last project. it helped me to test performance of my rockdatatables module to generate 3000 random json datasets and i want to share it with you. maybe it saves some time for someone.
      https://gitlab.com/baumrock/RockDummyData/
      easy example:
      $rdd = $modules->get('RockDummyData'); for($i=0; $i<15; $i++) { // this has to be inside the for-loop to always get a new dummy $dummy = $rdd->getDummy(); echo date("d.m.Y H:i:s", $dummy->timestamp) . "<br>"; } more advanced:
      $json = new stdClass(); $json->data = array(); $rdd = $modules->get('RockDummyData'); for($i=0; $i<3000; $i++) { // this has to be inside the for-loop to always get a new dummy $dummy = $rdd->getDummy(); $obj = new stdClass(); $obj->name = $dummy->forename . ' ' . $dummy->surname; $obj->position = $dummy->job; $obj->office = $dummy->city; $obj->color = $dummy->color; $obj->start_date = new stdClass(); $obj->start_date->display = date('d.m.Y',$dummy->timestamp); $obj->start_date->sort = $dummy->timestamp; $obj->salary = rand(0,10000); $json->data[] = $obj; } echo json_encode($json); you have to store your random datasets on your own into the /data folder. there are several services for creating all kinds of random data on the web - if you know one service that allows sharing those datasets let me know and i can include common needed data into the module
    • By AndySh
      Hello!
      I need your assistance please. I purchased the module FormBuilder. Unfortunately, the module discontinued delivering customer submissions to e-mail box specified in the module settings. Direct mailing to the e-mail box works OK. The module settings stays the same and are correct, like "Send e-mail to administrator(s) is checked. The last version of FormBuilder 3.0 has been installed. Please advise how to resolve the issue becase I cannot get orders from customers anymore (((
    • By kixe
      As described in this post (https://processwire.com/talk/topic/8551-custom-urls-for-pages/?p=82742) the option 'Name Format Children' under the tab 'Family' in template settings doesn't work properly and also not as expected. I had a look inside the code and made some changes which are working properly, which offers much more options, more consistency and less code too.

      The result is the following. You have 3 Options for generating name and title, which could be combined in endless variations.
      Name is always derived from title, same like creating pages manually.
      type date: if function detects # character anywhere in the string, conversion will be: deletion of # and string will be used as format parameter for PHP date() function type field: if string is a fieldname of the parent page the value of this field will be used type string: if string doesn't fit to the 2 preceeding it will be taken as it is All parts (separated by comma) will be composed in the order of setting. You can use unlimited numbers of parts

      I made a pull request on github: https://github.com/ryancramerdesign/ProcessWire/pull/831

      Example screenshots

      Setting ...


      will result in


       
    • By kongondo
      FieldtypeRuntimeMarkup and InputfieldRuntimeMarkup
       
      Modules Directory: http://modules.processwire.com/modules/fieldtype-runtime-markup/
      GitHub: https://github.com/kongondo/FieldtypeRuntimeMarkup
       
      This module allows for custom markup to be dynamically (PHP) generated and output within a page's edit screen (in Admin).
       
      The value for the fieldtype is generated at runtime. No data is saved in the database. The accompanying InputfieldRuntimeMarkup is only used to render/display the markup in the page edit screen.
       
      The field's value is accessible from the ProcessWire API in the frontend like any other field, i.e. it has access to $page and $pages.
       
      The module was commissioned/sponsored by @Valan. Although there's certainly other ways to achieve what this module does, it offers a dynamic and flexible alternative to generating your own markup in a page's edit screen whilst also allowing access to that markup in the frontend. Thanks Valan!
       
      Warning/Consideration
      Although access to ProcessWire's Fields' admin pages is only available to Superusers, this Fieldtype will evaluate and run the custom PHP Code entered and saved in the field's settings (Details tab). Utmost care should therefore be taken in making sure your code does not perform any CRUD operations!! (unless of course that's intentional) The value for this fieldtype is generated at runtime and thus no data is stored in the database. This means that you cannot directly query a RuntimeMarkup field from $pages->find(). Usage and API
       
      Backend
      Enter your custom PHP snippet in the Details tab of your field (it is RECOMMENDED though that you use wireRenderFile() instead. See example below). Your code can be as simple or as complicated as you want as long as in the end you return a value that is not an array or an object or anything other than a string/integer.
       
      FieldtypeRuntimeMarkup has access to $page (the current page being edited/viewed) and $pages. 
       
      A very simple example.
      return 'Hello'; Simple example.
      return $page->title; Simple example with markup.
      return '<h2>' . $page->title . '</h2>'; Another simple example with markup.
      $out = '<h1>hello '; $out .= $page->title; $out .= '</h1>'; return $out; A more advanced example.
      $p = $pages->get('/about-us/')->child('sort=random'); return '<p>' . $p->title . '</p>'; An even more complex example.
      $str =''; if($page->name == 'about-us') { $p = $page->children->last(); $str = "<h2><a href='{$p->url}'>{$p->title}</a></h2>"; } else { $str = "<h2><a href='{$page->url}'>{$page->title}</a></h2>"; } return $str; Rather than type your code directly in the Details tab of the field, it is highly recommended that you placed all your code in an external file and call that file using the core wireRenderFile() method. Taking this approach means you will be able to edit your code in your favourite text editor. It also means you will be able to type more text without having to scroll. Editing the file is also easier than editing the field. To use this approach, simply do:
      return wireRenderFile('name-of-file');// file will be in /site/templates/ If using ProcessWire 3.x, you will need to use namespace as follows:
      return ProcessWire\wireRenderFile('name-of-file'); How to access the value of RuntimeMarkup in the frontend (our field is called 'runtime_markup')
       
      Access the field on the current page (just like any other field)
      echo $page->runtime_markup; Access the field on another page
      echo $pages->get('/about-us/')->runtime_markup; Screenshots
       
      Backend
       

       

       
      Frontend