Merge pull request #172 from datasci4health/development

Development
harena-lab · Aug 13, 2020 · a9ce38f · a9ce38f
2 parents bd97fad + c4ea5a6
commit a9ce38f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/adonisjs/public/infra/basic.js b/src/adonisjs/public/infra/basic.js
@@ -224,7 +224,7 @@ class Basic {
       else if (!path.includes("/"))
          /* (!(path.startsWith("http://") || path.startsWith("https://") ||
                  path.startsWith("/") || path.startsWith("../"))) */
-         result = DCCCommonServer.managerAddress + "artifacts/cases/" +
+         result = DCCCommonServer.managerAddress + "resources/artifacts/cases/" +
                   ((this.host != null) ? this.currentCaseId + "/" : "") +
                   path;
       return result;

diff --git a/src/adonisjs/resources/views/layout/partials/settings-modal.edge b/src/adonisjs/resources/views/layout/partials/settings-modal.edge
@@ -48,10 +48,10 @@
             <small id="keywords-help" class="form-text text-muted">Inform your keywords separated by semicolon.</small>
           </div>
           <input type="hidden" id="source" name="source">
-          <button type="submit" class="btn btn-secondary" id="btn-save-settings">Save</button>
+          <button type="submit" class="btn btn-secondary" id="btn-save-settings" data-toggle="modal" data-target="#settings-modal">Save</button>
           <button type="button" class="btn btn-outline-secondary" data-dismiss="modal">Cancel</button>
         </form>
       </div>
     </div>
   </div>
-</div>
+</div>