Index: lams_tool_zoom/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r5da86331a25afcff7dfa0dd4647187c5beaa757b -rce10b59466077750298e5a6140680512ac8085a2 --- lams_tool_zoom/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5da86331a25afcff7dfa0dd4647187c5beaa757b) +++ lams_tool_zoom/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision ce10b59466077750298e5a6140680512ac8085a2) @@ -57,11 +57,11 @@ label.api.secret =Secret label.api.up =Up label.api.down =Down -label.api.remove =Remove API -label.api.saved =APIs were saved -error.api.ping =API with email {0} does not seem to work correctly -error.api.none.configured =There are no Zoom APIs configured by the sysadmin -error.api.reuse =All configured APIs are in use at the moment. You were assigned a random API. If you decide to start your meeting, another teacher's meeting will be stopped. -sysadmin.maintain= Back to sysadmin +label.api.remove =Remove API keys +label.api.saved =API keys were saved +error.api.ping =API keys for email {0} do not seem to work correctly +error.api.none.configured =There are no Zoom API keys configured by the administrator. You are not able to create a Zoom meeting. +error.api.reuse =All configured API keys are in use at the moment. If you decide to start your meeting, another teacher's meeting will be stopped. +sysadmin.maintain= Back to admin panel #======= End labels: Exported 64 labels for en AU ===== Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rce10b59466077750298e5a6140680512ac8085a2 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java (.../AuthoringAction.java) (revision ce10b59466077750298e5a6140680512ac8085a2) @@ -31,9 +31,12 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.beanutils.BeanUtils; +import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; import org.apache.struts.actions.DispatchAction; import org.lamsfoundation.lams.authoring.web.AuthoringConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -109,6 +112,12 @@ request.getSession().setAttribute(map.getSessionID(), map); request.setAttribute(ZoomConstants.ATTR_SESSION_MAP, map); + if (zoomService.getApis().isEmpty()) { + ActionErrors errors = new ActionErrors(); + errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("error.api.none.configured")); + this.addErrors(request, errors); + } + return mapping.findForward("success"); }