• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Added a new configuration item - server url context. This should be either "lams" or "rams". Used by the FCKEditor upload servlet code to generate the appropriate paths to the images.

Removed any other hardcoded "lams" I could find in the path for the FCKEditor handling.

    • -2
    • +1
    ./lams/authoring/web/AuthoringConstants.java
Updating the define later and run offline flags when live edit completes.

Schedule any new schedule gates - which requires a call across to monitoringService (grrr).

fixed single act design (+ live edit) issue caused by null pointer exception

added error handling and isLearningDesignAval check

    • -15
    • +21
    ./lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 2 more files in changeset.
split into two calls for setting up live edit

    • -119
    • +105
    ./lams/authoring/service/AuthoringService.java
    • -3
    • +8
    ./lams/authoring/web/EditOnFlyServlet.java
Redoing change from head that had been lost in the merge. Related to the login change done for 2.0.1

capture null ptr exception

    • -111
    • +114
    ./lams/authoring/service/AuthoringService.java
When a design is edited using live edit, we may have added activities on the end. So if anyone has the lesson marked as completed in their learner progress, the completed flag will need to be reset.

  1. … 4 more files in changeset.
fixed incorrect x-coord assignment for (activity == null) case

setting position of inserted system gate

    • -11
    • +28
    ./lams/authoring/service/AuthoringService.java
merged changes

When the system gates are removed, we need to remove the references to them in any learner's progress records.

remove temp system gate

Merging 2.0.1 changes from the HEAD

    • -8
    • +3
    ./lams/security/JspRedirectStrategy.java
    • -0
    • +4
    ./lams/web/tag/LAMSMultiLinesTextareaTag.java
    • -7
    • +111
    ./lams/webservice/RegisterServiceSoapBindingImpl.java
    • -2
    • +119
    ./lams/webservice/RegisterServiceSoapBindingSkeleton.java
  1. … 230 more files in changeset.
added check editonfly cond for obj extractor

Fixing up todo comment

Remove the tool sessions related to any non-grouped activity which is deleted via edit on fly. Doesn't apply to grouped activities as their tool sessions aren't "pre-initialised" when the lesson is started.

    • -51
    • +127
    ./lams/authoring/ObjectExtractor.java
  1. … 2 more files in changeset.
edit on the fly (author) loaded within monitor frame and when done with changes reloads monitor

    • -57
    • +66
    ./lams/authoring/service/AuthoringService.java
  1. … 10 more files in changeset.
moved some funct to monitor (setting up edit on fly) and author just opens the design in the correct mode + few fixes for new system gate + finish edit on fly lock and gate release

    • -41
    • +88
    ./lams/authoring/service/AuthoringService.java
    • -10
    • +5
    ./lams/authoring/web/AuthoringAction.java
    • -1
    • +5
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 9 more files in changeset.
change to use servlet for edit on fly setup + added lesson lock + added design edit check + wizard fix to show full name of users

    • -2
    • +12
    ./lams/authoring/service/IAuthoringService.java
    • -1
    • +22
    ./lams/authoring/web/AuthoringAction.java
    • -0
    • +143
    ./lams/authoring/web/EditOnFlyServlet.java
  1. … 9 more files in changeset.
clear read only field (Set to false) when saving a read only design (during copy of a design's tool activities)

  1. … 2 more files in changeset.
updated logic for adding gate activity to runtime sequence

    • -28
    • +76
    ./lams/authoring/service/AuthoringService.java
    • -6
    • +10
    ./lams/authoring/service/EditOnFlyProcessor.java
  1. … 2 more files in changeset.
added system gate + functionality/handling to add a system gate to the LD when setting up Edit on the Fly (flash/java)

    • -4
    • +107
    ./lams/authoring/service/AuthoringService.java
    • -0
    • +92
    ./lams/authoring/service/EditOnFlyProcessor.java
    • -1
    • +10
    ./lams/authoring/service/IAuthoringService.java
  1. … 14 more files in changeset.
few fixes/tweaks for edit on the fly in authoring - save function working

  1. … 5 more files in changeset.
made authoring (edit-on-fly) popup out of monitor (temp.) + authoring changes for edit mode (loading design to edit on startup) + canvas view changes (lesson name lip) + backend java changes for setting up edit locks for LD

    • -1
    • +24
    ./lams/authoring/service/IAuthoringService.java
    • -2
    • +8
    ./lams/authoring/web/AuthoringAction.java
  1. … 19 more files in changeset.
model changes for edit-on-the-fly

  1. … 11 more files in changeset.