Skip to content

Commit

Permalink
Publish before merge
Browse files Browse the repository at this point in the history
  • Loading branch information
jorisburgers committed Mar 17, 2017
1 parent 4f8fa1b commit 03efedd
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion import-choose.php
Expand Up @@ -133,7 +133,7 @@ function CheckAll() {
currentProject = template_id;
sourceProject = -1;
$("#merge").hide();

$("#pagetype").html("Import");
$(".optButtonContainer").hide();
initWorkspace()
$('#workspace').bind("DOMSubtreeModified",function(){
Expand All @@ -142,6 +142,7 @@ function CheckAll() {

$("#merge").click(function(e)
{
publish();
merged = true;
source_pages = [];
$(".pageCheckbox").each(function(){
Expand Down

0 comments on commit 03efedd

Please sign in to comment.