Skip to content

Commit ea78b6c

Browse files
committed
[pages] fetch webterm link from config dict
1 parent 7a4d350 commit ea78b6c

4 files changed

Lines changed: 7 additions & 14 deletions

File tree

inginious/frontend/app.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ def flask_internalerror(e):
234234
flask_app.client = client
235235
flask_app.default_allowed_file_extensions = default_allowed_file_extensions
236236
flask_app.default_max_file_size = default_max_file_size
237-
flask_app.webterm_link = config.get("WEBTERM", None)
238237
flask_app.allow_registration = config.get("ALLOW_REGISTRATION", True)
239238
flask_app.allow_deletion = config.get("ALLOW_DELETION", True)
240239
flask_app.available_languages = available_languages

inginious/frontend/pages/tasks.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ def __init__(self, calling_page):
3535
self.user_manager = self.cp.user_manager
3636
self.default_allowed_file_extensions = self.cp.default_allowed_file_extensions
3737
self.default_max_file_size = self.cp.default_max_file_size
38-
self.webterm_link = self.cp.webterm_link
3938

4039
def preview_allowed(self, courseid, taskid):
4140
try:
@@ -146,11 +145,11 @@ def GET(self, courseid, taskid, is_LTI):
146145

147146
# Display the task itself
148147
return render_template("task.html", user_info=user_info, course=course, task=task,
149-
submissions=submissions, students=students,
150-
eval_submission=eval_submission, user_task=user_task,
151-
previous_taskid=previous_taskid, next_taskid=next_taskid,
152-
webterm_link=self.webterm_link, input_random_list=random_input_list,
153-
visible_tags=visible_tags, pdict=pdict, is_input_list=is_input_list)
148+
submissions=submissions, students=students,
149+
eval_submission=eval_submission, user_task=user_task,
150+
previous_taskid=previous_taskid, next_taskid=next_taskid,
151+
input_random_list=random_input_list, visible_tags=visible_tags,
152+
pdict=pdict, is_input_list=is_input_list)
154153

155154
def POST(self, courseid, taskid, isLTI):
156155
""" POST a new submission """

inginious/frontend/pages/utils.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ def environment_types(self) -> Dict[str, FrontendEnvType]:
101101
""" Available environment types """
102102
return get_all_env_types()
103103

104-
@property
105-
def webterm_link(self) -> str:
106-
""" Returns the link to the web terminal """
107-
return self.app.webterm_link
108-
109104
@property
110105
def logger(self) -> logging.Logger:
111106
""" Logger """

inginious/frontend/templates/task.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,9 @@ <h2>
306306
<hr/>
307307
<div id="task_alert"></div>
308308
<div id="ssh_template" style="display:none;">
309-
{% if webterm_link %}
309+
{% if config.WEBTERM %}
310310
<div id="webterm">
311-
<input type="hidden" value="{{webterm_link}}" id="webterm_link"/>
311+
<input type="hidden" value="{{ config.WEBTERM }}" id="webterm_link"/>
312312
</div>
313313
{{ _("Alternatively, you can also paste this command into your terminal:") }}<br/>
314314
{% else %}

0 commit comments

Comments
 (0)