Skip to content

Commit 502c0a1

Browse files
raileendrraileendr
authored
Merge pull request #109 from docusign/9238
rooms example 6 update and corrected an error that was routing rooms …
2 parents 60e69d9 + 1df27d7 commit 502c0a1

5 files changed

Lines changed: 82 additions & 56 deletions

File tree

‎app/docusign/views.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ def ds_callback():
118118
session["ds_account_name"] = account["account_name"]
119119
session["ds_base_path"] = account["base_uri"] + base_uri_suffix
120120

121-
session["is_cfr"] = is_cfr(session["ds_access_token"], session["ds_account_id"], session["ds_base_path"])
121+
if EXAMPLES_API_TYPE["ESignature"] == "true":
122+
session["is_cfr"] = is_cfr(session["ds_access_token"], session["ds_account_id"], session["ds_base_path"])
122123

123124
if not redirect_url:
124125
redirect_url = url_for("core.index")
@@ -155,5 +156,4 @@ def ds_return():
155156
envelope_id=envelope_id,
156157
state=state,
157158
manifest=session["manifest"]
158-
)
159-
159+
)

‎app/rooms/examples/eg006_create_external_form_fill_session.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ def get_args():
1818
"access_token": session["ds_access_token"], # Represents your {ACCESS_TOKEN}
1919
"room_id": request.form.get("room_id"),
2020
"form_id": request.form.get("form_id"),
21+
"x_frame_allowed_url": "http://localhost:3000"
2122
}
2223

2324
@staticmethod
@@ -86,11 +87,12 @@ def worker(args):
8687

8788
# Step 2. Create an external form fill session
8889
form_fill_session_api = ExternalFormFillSessionsApi(api_client)
89-
response = form_fill_session_api.create_external_form_fill_session(
90+
results = form_fill_session_api.create_external_form_fill_session(
9091
body=ExternalFormFillSessionForCreate(
9192
room_id=args['room_id'],
92-
form_id=args['form_id']
93+
form_id=args['form_id'],
94+
x_frame_allowed_url = args['x_frame_allowed_url']
9395
),
9496
account_id=args["account_id"]
9597
)
96-
return response
98+
return results

‎app/rooms/views/eg006_create_external_form_fill_session.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import json
55

66
from docusign_rooms.client.api_exception import ApiException
7-
from flask import render_template, Blueprint, session
7+
from flask import render_template, redirect, Blueprint, session
88

99
from ...ds_config import DS_CONFIG
1010
from ..examples.eg006_create_external_form_fill_session import Eg006CreateExternalFormFillSessionController
@@ -37,15 +37,14 @@ def create_external_form_fill_session():
3737
results = Eg006CreateExternalFormFillSessionController.worker(args)
3838
except ApiException as err:
3939
return process_error(err)
40+
41+
#return results["redirect_url"]
4042

41-
# 3. Show URL for a new external form fill session
4243
return render_template(
43-
"example_done.html",
44+
"example_rooms_6_done.html",
4445
title=example["ExampleName"],
45-
message="Results from the Forms::CreateExternalFormFillSession:",
4646
json=json.dumps(json.dumps(results.to_dict(), default=str)),
47-
link=results.url,
48-
link_text="Please fill the form"
47+
url = results.url
4948
)
5049

5150

@@ -101,7 +100,7 @@ def get_forms():
101100
room = Eg006CreateExternalFormFillSessionController.get_room(args)
102101
except ApiException as err:
103102
return process_error(err)
104-
103+
105104
# 4. Render the response
106105
return render_template(
107106
"rooms/eg006_create_external_form_fill_session.html",

‎app/templates/example_rooms_6_done.html‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!-- extend base layout --> {% extends "base.html" %} {% block content %}
2+
3+
<h2>{{ title }}</h2>
4+
<p>{{ message | safe }}</p>
5+
6+
<p> Results from the ExternalFormFillSessions::CreateExternalFormFillSession: </p>
7+
<p><code>{{json}}</code></p>
8+
9+
<iframe width="1000" height="800" src = "{{url}}" >
10+
11+
</iframe>
12+
13+
14+
{% if changed_settings %}
15+
<ul>
16+
{% for k, v in changed_settings.items() %}
17+
<li><b>{{ k }}:</b> {{ v }}</li>
18+
{% endfor %}
19+
</ul>
20+
{% endif %}
21+
22+
<p><a href="/">Continue</a></p>
23+
24+
{% endblock %}

‎app/templates/rooms/eg006_create_external_form_fill_session.html‎

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,49 @@
22

33
<div class="container">
44

5-
{% include 'example_info.html' %}
6-
{% set form_index = 0 %}
7-
{% set room_form_index = 0 %}
8-
{% set room_id_index = 0 %}
9-
{% set form_id_index = 0 %}
10-
{% set redirect_to4_index = 0 %}
11-
{% set redirect_to1_index = 1 %}
12-
13-
{% if rooms %}
14-
<form class="eg" action="/forms" method="post" data-busy="form">
15-
<div class="form-group">
16-
<label for="room_id">{{ example['Forms'][form_index]['Inputs'][room_id_index]['InputName'] }}</label>
17-
<select class="form-control" id="room_id" name="room_id">
18-
{% for room in rooms %}
19-
<option value="{{ room.room_id }}">{{ room.name }}</option>
20-
{% endfor %}
21-
</select>
22-
</div>
23-
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
24-
<button type="submit" class="btn btn-docu">Get forms</button>
25-
</form>
26-
{% elif room_name and forms %}
27-
<form class="eg" action="eg006" method="post" data-busy="form">
28-
<label for="room_name">{{ example['Forms'][form_index]['Inputs'][room_id_index]['InputName'] }}</label>
29-
<input type="text" class="form-control" id="room_name" name="room_name" value="{{ room_name }}" readonly><br/>
30-
<input type="hidden" class="form-control" name="room_id" value="{{ room_id }}" readonly>
31-
<div class="form-group">
32-
<label for="form_id">{{ example['Forms'][room_form_index]['Inputs'][form_id_index]['InputName'] }}</label>
33-
<select class="form-control" id="form_id" name="form_id">
34-
{% for form in forms %}
35-
<option value="{{ form.docu_sign_form_id }}">{{ form.name }}</option>
5+
{% include 'example_info.html' %}
6+
{% set form_index = 1 %}
7+
{% set room_form_index = 0 %}
8+
{% set room_id_index = 0 %}
9+
{% set form_id_index = 0 %}
10+
{% set redirect_to4_index = 0 %}
11+
{% set redirect_to1_index = 1 %}
12+
13+
{% if rooms %}
14+
<form class="eg" action="/forms" method="post" data-busy="form">
15+
<div class="form-group">
16+
<label for="room_id">{{ example['Forms'][form_index]['Inputs'][room_id_index]['InputName'] }}</label>
17+
<select class="form-control" id="room_id" name="room_id">
18+
{% for room in rooms %}
19+
<option value="{{ room.room_id }}">{{ room.name }}</option>
3620
{% endfor %}
3721
</select>
38-
</div>
39-
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
40-
{% include 'submit_button.html' %}
41-
</form>
42-
{% elif room_name and not forms %}
43-
{{ example['RedirectsToOtherCodeExamples'][redirect_to4_index]['RedirectText'].format('href="eg004"') | safe }}
44-
{% else %}
45-
{{ example['RedirectsToOtherCodeExamples'][redirect_to1_index]['RedirectText'].format('href="eg001"') | safe }}
46-
{% endif %}
47-
48-
</div>
49-
{% endblock %}
22+
</div>
23+
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
24+
<button type="submit" class="btn btn-docu">Get forms</button>
25+
</form>
26+
{% elif room_name and forms %}
27+
<form class="eg" action="reg006" method="post" data-busy="form">
28+
<label for="room_name">{{ example['Forms'][form_index]['Inputs'][room_id_index]['InputName'] }}</label>
29+
<input type="text" class="form-control" id="room_name" name="room_name" value="{{ room_name }}" readonly><br/>
30+
<input type="hidden" class="form-control" name="room_id" value="{{ room_id }}" readonly>
31+
<div class="form-group">
32+
<label for="form_id">{{ example['Forms'][room_form_index]['Inputs'][form_id_index]['InputName'] }}</label>
33+
<select class="form-control" id="form_id" name="form_id">
34+
{% for form in forms %}
35+
<option value="{{ form.docu_sign_form_id }}">{{ form.name }}</option>
36+
{% endfor %}
37+
</select>
38+
</div>
39+
<input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
40+
{% include 'submit_button.html' %}
41+
</form>
42+
{% elif room_name and not forms %}
43+
{{ example['RedirectsToOtherCodeExamples'][redirect_to4_index]['RedirectText'].format('href="reg004"') | safe }}
44+
{% else %}
45+
{{ example['RedirectsToOtherCodeExamples'][redirect_to1_index]['RedirectText'].format('href="reg001"') | safe }}
46+
{% endif %}
47+
48+
</div>
49+
{% endblock %}
50+

0 commit comments

Comments
 (0)