senaduka/old-new-wiaas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Bugfixes #89

Merged
bilal.catic merged 49 commits from development into master 2018-12-13 13:25:17 +01:00
Conversation 3 Commits 49 Files Changed 86 +14 -1
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 103fc53c1d - Show all commits

5
backend/app/plugins/wiaas/assets/css/wiaas-admin-delivery-process.css
View File

@@ -82,4 +82,9 @@
width: 84px;
text-align: center;
padding-right: 10px;
}
.wiaas-delivery-process-step-instructions {
padding: 10px 50px;
border-bottom: 1px solid #eee;
}

10
backend/app/plugins/wiaas/includes/admin/delivery-process/views/html-delivery-process-step.php
View File

@@ -25,7 +25,15 @@ if ($is_current_step) {
</h3>
<?php
//Gravity_Flow_Entry_Detail::maybe_show_instructions(true, true, $step->get_form(), $form, $step->get_entry());
if ($step->instructionsEnable) {
$instructions = $step->instructionsValue;
$instructions = GFCommon::replace_variables( $instructions, $step->get_form(), $step->get_entry(), false, false, true );
$instructions = do_shortcode( $instructions );
echo '<div class="wiaas-delivery-process-step-instructions">' . $instructions . '</div>';
}
$action_form = GFAPI::get_form( $step->target_form_id );