Skip to content

GitLab

Switch branch/tag
  1. 06 Jul, 2015 1 commit
  3. 03 Jul, 2015 1 commit
  5. 26 Jun, 2015 1 commit
  7. 15 Jun, 2015 1 commit
  9. 29 May, 2015 1 commit
  11. 14 Apr, 2015 1 commit
  13. 13 Apr, 2015 1 commit
  15. 22 Mar, 2015 1 commit
  17. 17 Mar, 2015 3 commits
  19. 13 Mar, 2015 2 commits
  21. 12 Mar, 2015 1 commit
  23. 09 Mar, 2015 1 commit
  25. 04 Mar, 2015 2 commits
  27. 03 Mar, 2015 1 commit
    • Nigel Cunningham's avatar
      (Bug1352028) Add a JSON progress bar for bulk operations. · 55a8deb8
      Nigel Cunningham authored 
      

This patch adds a JSON progress meter (I'll call it that to avoid confusion
with progress bars) to the bulk uploading of users, groups and group
memberships and the bulk export and import of users (LEAP), so the user can see
the progress of the operation and not just the submit button changed to
'Processing..' and whatever indication their browser gives while waiting for
content.

The bulk export and import are minor rewrites, replacing the old iframe based
progress bar and the associated multiple pages and additional template file in
the case of the bulk export, and the recursive redirect-to-self of the bulk
import.

To accomplish the display of the progress bar during the operation, we make the
PHP session be closed (read only) except when changes need to be made. This is
for the most part a straightforward change in session.php as it's the only
direct accessor. In other places, we replace direct accessing of the session
variable ($_SESSION) with use of the session class ($SESSION) so that it can
reopen the session, make the change and close the session again.

There is one more aspect to all of this: with previous behaviour, multiple
requests for the same session would queue, taking the session lock in turn.
After this patch is applied, they can proceed in parallel, allowing greater
throughput. There is no additional locking requirement because the issues are
the same as those already dealt with in allowing multiple PHP threads to
process requests from different sessions at the same time.

I have sought to make the progress meter nice and generic, so it can be used in
the other bulk imports and exports too.

Paradoxically, these changes don't just make the import seem to be faster, it
actually is.. at least in the case of users and groups.

Times for importing 1000 users, groups and memberships, averaged over 3 runs
each (Wall time, not CPU time - but the relationship is the same).

                Without Progress     With Progress
Users                166s               155s
Groups                85s                78s
Memberships           20s                19s

Change-Id: Iec15c57db32c77994edb80c71d65591de51a95e4
Signed-off-by: default avatarNigel Cunningham <nigelc@catalyst-au.net>
      55a8deb8
  29. 26 Feb, 2015 1 commit
  31. 02 Feb, 2015 1 commit
  33. 21 Jan, 2015 1 commit
  35. 16 Jan, 2015 1 commit
  37. 03 Dec, 2014 1 commit
  39. 16 Nov, 2014 1 commit
  41. 22 Sep, 2014 2 commits
  43. 18 Sep, 2014 1 commit
    • Robert Lyon's avatar
      The archiving of submitted pages/collections from groups (Bug #1335670) · 5c57b565
      Robert Lyon authored 
      

This patch contains:
- The export queue system where pages/collections on release from
submission are added to the export queue table ready to be archived.
- The export queue admin page showing what is in the queue to be
exported. The cron runs every 6 minutes. Queue items failed to export
are also shown here.
- The archive list admin page, where one can download the generated
leap2a files for the archived submissions.

In this patch you should be able to add things to the export queue by
either releasing a sumbission on a group that has 'archive
submissions' option ticked. This will add the archive to that archived
submission page, or you can also run a leap2a export from portfolio
export which will add the export queue and send you an email once the
export is done.

Things to note:
- The is a server busy function that stops the export queue from
running but I'm not too sure if the threshold is too low/high
- The export queue tries to export the first 100 items each run but if
resources are fine in handling that easily then the number could be
higher but I'm not sure of what will be a good number.
- Currently there is alsoe infrastructure like table columns for dealing
with releasing submissions from external systems (eg moodle) but that
functuionality is yet to be built.
- The checking of server busy in MS windows untested - may need to
just let MS ignore server busy check as there doesn't seem to be
standard way to check this.

Change-Id: If4c1d272e9c5d46fbf16b2ff73ceb2687c06ffd4
Signed-off-by: Robert Lyon's avatarRobert Lyon <robertl@catalyst.net.nz>
      5c57b565
  45. 16 Sep, 2014 1 commit
    • Nigel Cunningham's avatar
      (Bug548021) Add support for anonymising pages. · 9624d430
      Nigel Cunningham authored 
      

This patch adds support for anonymising pages.

It creates a site option in the General Settings section named 'Allow
anonymous pages' that must be checked for any page to be anonymised.

If the site option is enabled, a new 'Anonymise' setting in the
'Edit title and description' tab of pages is enabled, allowing the owner
to request that this page be anonymised.

When both settings are enabled and a user views a page, two things may
happen to the author's information.

First, if the user is not logged in or does not have admin, staff or
owner privileges for the page, the author's name is replaced by the
anonymous text (defaulting to "(Author's name hidden)") in both the
body of the page and the metadata author field.

If the user does have admin, staff or owner privileges for the page,
the author's name is anonymised as above except that the text displayed
is made into a link. When this link is clicked, the anonymous author
text is replaced by the normal author information for the page.

Anonymous pages displayed in the 'Latest pages' block and shared with
a group are also anonymised by this patch.

Change-Id: I2e2c92f641329a1a305cf58a5c5d47bf95436a8b
Signed-off-by: default avatarNigel Cunningham <nigelc@catalyst-au.net>
      9624d430
  47. 15 Sep, 2014 1 commit
  49. 14 Sep, 2014 1 commit
  51. 24 Aug, 2014 1 commit
  53. 24 Jul, 2014 1 commit
  55. 16 Jun, 2014 1 commit
  57. 05 Jun, 2014 1 commit
  59. 27 May, 2014 1 commit
  61. 25 May, 2014 1 commit
  63. 11 May, 2014 1 commit
  65. 04 May, 2014 1 commit
  67. 16 Apr, 2014 1 commit
    • Nathan Lewis's avatar
      Improvements to notification system (Bug #1299993) · 63e0484d
      Nathan Lewis authored 
      

- Each activity type can specify a default notification method. They default
  to 'email' to remain backwards compatible.
- Each activity type can specify if it is allowed to be set to 'none'. Defaults
  to 'allowed' for backwards compatibility.
- Removed 'required' from notification settings - it didn't make sense, and the
  change above deals with this in a better way.
- The site wide defaults for each activity type can be edited in
  Site options -> Notification settings. These are applied to new users or
  whenever a user does not have the appropriate usr_activity_preference records.
- Removed 'Default notification method' as it's functionality is now covered by
  the change above.
- There is a separate help next to each activity type to explain what messages
  will be affected by the setting.

Change-Id: I131cdeefbeaa8e43688aefd9d770fc8cb9bceea8
Signed-off-by: default avatarNathan Lewis <nathan.lewis@totaralms.com>
      63e0484d
  69. 30 Mar, 2014 1 commit
    • Aaron Wells's avatar
      Renaming general pages to static pages · d4c63e88
      Aaron Wells authored and Robert Lyon's avatar Robert Lyon committed 
      Bug1282219: See the lengthy discussion on the bug tracker. No perfect name
for these items has arisen yet, but I think "static pages" is the best
so far because:

1. It means they're obviously not the same type of thing as the Pages in your
portfolio, because those are dynamic.

2. It's more self-evident. If I were brand new to Mahara and were
trying to figure out how to change the "Privacy Policy" page, "Static pages"
is probably what I would think to click on.

Change-Id: I7dd4e3fe6e86fd35dce973afb78b3e56049aab69
      d4c63e88