Commits · d55830641af8991d635713aa5a2af0fbf98fb277 · mahara / mahara

05 Oct, 2009 21 commits

Handle core entries for import separately so we can do view import after everything else. · d5583064

Nigel McNie authored Oct 05, 2009



This is so that we know all artefacts have been created, so that the
views they're in can also then be set up.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

d5583064

Don't create an e-mail address for users in the prototype importer. · 86d476fc
Nigel McNie authored Oct 05, 2009
```
We get one (or more) from the import file now.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
86d476fc
Only attempt to export from plugins that provide export libraries. · ced0841c
Nigel McNie authored Oct 05, 2009
```
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
ced0841c

Rewrite all the artefact IDs in view exports to be LEAP entry IDs. · c994ce46

Nigel McNie authored Oct 05, 2009



This looks in the artefactid and artefactids fields only (which we know
are either a lone artefact ID, or a list of them, based on the field
name). This is somewhat of a limitation if blocks are storing artefact
IDs elsewhere, but it's not insurmountable.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

c994ce46

Add $viewconfig parameter to import_create_blockinstance, rename the other parameter. · fc8c18e1

Nigel McNie authored Oct 05, 2009

We pass through the view config as well so that the importing methods
can look at the view owner, among other things it might want to look at.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

fc8c18e1

Unconditionally json_encode every config field being exported for blockinstances. · 4b7e07bb

Nigel McNie authored Oct 05, 2009



This allows us to unconditionally json_decode them on import without
worrying about whether they were encoded or not.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

4b7e07bb

Implement multiple e-mail field importing in internal artefact plugin. · 6ab96d73
Nigel McNie authored Oct 05, 2009
```
We import the first one as the primary e-mail address.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
6ab96d73

Implement View export and import routines for profileinfo blockinstance. · f9b82b31

Nigel McNie authored Oct 05, 2009



One hack: we shove the profile icon ID in the artefactid field, so it
gets converted to a proper leap entry ID on the way out, and back to an
artefact ID on the way in.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

f9b82b31

Allow the View methods export_config and import_config to take an optional format parameter. · e71fe154

Nigel McNie authored Oct 05, 2009



This allows us to hint that the View needs to export config suitable for
a certain format (e.g. leap), so it can give us data we can manage in an
easier form.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

e71fe154

Allow the config passed to View::import_from_config to include ownership information. · 50a7d5b1
Nigel McNie authored Oct 05, 2009
```
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
50a7d5b1

Make get_artefactchooser_artefacts take a user parameter, and update calls to it. · e6cfce65

Nigel McNie authored Oct 05, 2009



This allows it to be used when we're doing things with Views not owned
by the logged in user in blockinstance->commit(). For example, when the
admin user is importing a new user.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

e6cfce65

Don't allow get_artefacts returning empty artefact IDs to break rebuild_artefact_list() · 1c7dd5c2

Nigel McNie authored Oct 05, 2009



This behaviour has been observed once or twice from badly written
get_artefacts() methods. We now make sure all the artefact IDs returned
are checked to be integers.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

1c7dd5c2

Remove some errant whitespace. · 8f6de1e8
Nigel McNie authored Oct 05, 2009
```
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
8f6de1e8

Sort artefacts, making sure that the primary e-mail address comes first · 1e38c70c

Nigel McNie authored Oct 05, 2009



Semantically, this means our exports have the most important e-mails
first, which we use at import time to make sure we set the primary
e-mail correctly.
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>

1e38c70c

Make the profileinfo block's get_artefacts method less likely to return blank artefact IDs. · f65e1d92
Nigel McNie authored Oct 05, 2009
```
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
f65e1d92
Remove some TODOs I'm not going to do. · 2659ef71
Nigel McNie authored Sep 23, 2009
```
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
2659ef71
Make the RSS blocktype fully importable. · dba67ee6
Nigel McNie authored Sep 23, 2009
```
Signed-off-by: Nigel McNie <nigel@catalyst.net.nz>
```
dba67ee6
Delete institution views and artefacts before attempting to delete the institution · 4a54703f
Richard Mansfield authored Oct 05, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
4a54703f
Reset script timer on each progress bar update. · 072aad48
Richard Mansfield authored Oct 05, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
072aad48
Merge branch 'unzip' · ed950b40
Richard Mansfield authored Oct 05, 2009

ed950b40
Display progress bar during unzip · 9b599d3f
Richard Mansfield authored Oct 05, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
9b599d3f

04 Oct, 2009 2 commits
- Set up tinymce for RTL languages · f9fb310e
  Richard Mansfield authored Oct 05, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
(cherry picked from commit 03667644)
```
  f9fb310e
- Set up tinymce for RTL languages · 03667644
  Richard Mansfield authored Oct 05, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  03667644
02 Oct, 2009 4 commits
- Merge commit 'origin/master' into unzip · c5a6de11
  Richard Mansfield authored Oct 02, 2009
  
  c5a6de11
- Faster deletion of folders with lots of artefacts inside them · ea0879e2
  Richard Mansfield authored Oct 02, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  ea0879e2
- Merge branch 'master' of git+ssh://git.mahara.org/git/mahara · d35845da
  Richard Mansfield authored Oct 02, 2009
  
  d35845da
- Faster deletion of folders with lots of artefacts inside them · 064531f4
  Richard Mansfield authored Oct 02, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  064531f4
28 Sep, 2009 10 commits
- Add archive to nasty hardcoded artefacttype places · f176da93
  Richard Mansfield authored Sep 29, 2009
  
  f176da93
- Merge commit 'origin/master' into unzip · 8dc3a580
  Richard Mansfield authored Sep 29, 2009
  
  8dc3a580
- Move unzip link to the left of edit,delete buttons · cd4e3e19
  Richard Mansfield authored Sep 29, 2009
  
  cd4e3e19
- Poll artefact plugins for valid attachment artefacttypes rather than hardcoding · fc4cbf62
  Richard Mansfield authored Sep 28, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  fc4cbf62
- Merge commit 'origin/master' into unzip · fbedc264
  Richard Mansfield authored Sep 28, 2009
  
  fbedc264
- Better warnings when deleting files/folders · f9c844af
  Richard Mansfield authored Sep 28, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  f9c844af
- Merge commit 'origin/master' into unzip · 2ef1b708
  Richard Mansfield authored Sep 28, 2009
```
Conflicts:

	htdocs/artefact/file/theme/raw/form/filelist.tpl
```
  2ef1b708
- Show delete button for non-empty folders · c8ede094
  Richard Mansfield authored Sep 28, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  c8ede094
- Warn when deleting files attached to views; initial support for deleting non-empty folders · 03f77081
  Richard Mansfield authored Sep 28, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  03f77081
- Make add blog, blog settings buttons less prominent on view blog page · 0da65864
  Richard Mansfield authored Sep 28, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  0da65864
25 Sep, 2009 2 commits
- Fix capitalisation of file artefact type in tag searches · 3da80228
  Richard Mansfield authored Sep 25, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  3da80228
- Prevent sql error when adding block to view and admin public folder doesn't exist yet · 26a5ca7f
  Richard Mansfield authored Sep 25, 2009
```
Signed-off-by: Richard Mansfield <richardm@catalyst.net.nz>
```
  26a5ca7f
24 Sep, 2009 1 commit
- Recognise zip files on upload & add unzip page · f372a1f2
  Richard Mansfield authored Sep 24, 2009
  
  f372a1f2