GitLab

* changes:
  Fix test for internal js files in block javascript
  Eval js to rewrite task titles after block configuration (bug #845534)
  Use function to process get_instance_config_javascript js (bug #845534)

Change-Id: I699fe4418e2c21ec227feb8fc5a5940f529c8f73
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

The test for whether a blocktype plugin's js file was internal (and
needed a wwwroot added) is case sensitive, and ignored https.

Change-Id: Idc81123d0367df739a698ab688b4d4a59e023da0
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When running through the list of a user's groups for display in the
Share with my groups buttons, a group with a long name can cause
another group's button to have the long-named group's short name
displayed.  The php array pointer is not moved when items are added
to the array.

Change-Id: If90b63ec721bfbee2b2c1ad2c7d29d855c9ce1f2
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When a plans block is first added to the page, the javascript overlay of
the task titles was not evaluated.  This is fixed by moving javascript
functions for the plans block into a new javascript file and pulling the
script onto the page with the same method used by the configuration form
javascript.  A new get_instance_inline_javascript method is added to
initialise the block when it's first configured.

Change-Id: I148a1e8a667c26fe58b3f915768ada4743718c5b
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Moving this code into its own function will allow it to be used for
block instance rendering javascript as well as the configuration form.

Change-Id: I42dba8425a8455aaa9faae19d50414e33c5988db
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Change-Id: Iab7aac11915b19d0c3e306949513dfc90e6a82c6
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Change-Id: Ib2d1cd9068a48d7f199dd3d056ab52ef93a3d59b
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Trying to access blocktype/wall/deletepost.php with a bad wallpost id
creates a new empty View object, and attempts to commit it to the db
when the View destructor is called.  This fails with an sql error, and
then a PHP Fatal error.

Change-Id: I7e462cc4ea6cda0611e432336839d153bbd0a42e
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

This was previously added in commit 80006487 but deleted again by
commit 1fec6736

.  See bug #597479.

Change-Id: If27ac8e9f5c7de0f72fce2c0306e40a046134ab2
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Friend request notifications from deleted users stay in the inbox,
and contain a url to the deleted user's profile.  We should just
delete these notifications, because they're no longer useful.

Change-Id: I224197238e3d5ca2f90bd28514a07f6d5d6b9852
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

The artefact_access_role subselect can return a lot of rows when
artefact_access_role is joined to group_member without also going
through artefact.

Also, the artefact_access_role & artefact_access_usr checks are
moved in to subselects in the where clause, because that appears
to make the query run faster.

Change-Id: Ibba16c8db59213fe4861262a950d628937f5ec13
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

This seems to speed the query up, probably because there are usually
not many files inside the admin public folder.

Change-Id: I99a3eff6e4b52e4942f490331d6f2cc48a3a5b0d
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Change-Id: Ied14a399ba2b5552187784b53ec5b8213979638d
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Bug #872619

Regression from 79810c3d



Basically, a default parameter of null was given, then trim
was called, which made it into the string '' which then failed
the test is_null in the files it was used.

This reorders the functions so that the trim is called after
the test to see whether the default should be used. This means
that the default value is never trimmed, and can be null.

One exception to this, is the param_boolean which doesn't test
to see whether it is the default that is returned, so a check
is made first to see whether it is null.

Change-Id: I66d7253a8414dec7eb3ea67ebd363ea068a32012
Signed-off-by: Hugh Davenport <hugh@catalyst.net.nz>

Instead of displaying content inside the editors on these pages,
it is useful if the user can see the html content as it would be
displayed to someone else.  The default on these pages is now to
display the various resume fields as html, with an edit button
beside each field to open up the editor.

Also combines some code to create & submit several similar resume
forms into functions in artefact/resume/lib.php

Change-Id: I649d7788a7e70dfd5dd3eb1ce648f37a7c057aa0
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

These strings should have been part of d6446942
and can be seen as missing strings on http://mahara.example.com/tags.php



Bug #869925

Change-Id: I171bdf6278dd94b477a9f9164e171dfa85b77885
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

Thanks to Melissa Newman for the fix.

Change-Id: Ied9197dd0e95df388e741af807ef498aeb85a102
Signed-off-by: Francois Marier <francois@catalyst.net.nz>

* changes:
  Remove view title display logic from my views template (bug #860154)
  Overwrite the profile view title on the Share page (bug #860154)
  Move the check for deleted groups when creating a View
  Get moderating roles from group function instead of the view

As a result of profile view access changes in bug #807278, profile
views are displayed on the share page.  So the 'editing' version
of view titles needs to be displayed in two places (my views/
group views etc., and on the share page).  It makes sense to use
the same View methods in both cases, and remove the old logic to
get the view title and url from the template.

Change-Id: Ifa36651dc3358acd71ca63407df79799ddd47299
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

The profile view title is now displayed on the share page, due to
recent changes in profile view access (see bug #807278).  However
the view title from the database is now displayed on the share page
instead of the translatable string.

Change-Id: Ic691469731923faa0cef0c204b1207a9152e9fe2
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When constructing a View, we only need to perform the deleted group
check when pulling a view record out of the db, not every time we
create a View.  This change allows faster creation of View objects
in those cases where we already have all the data at hand.

Change-Id: I4d13446f31d841323692923a1cfc2647a2f3b2ed
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When deciding who can moderate comments on a group view, the
'moderating' roles are stored in the view object, but they don't
need to be, because they only depend on the group settings.  So
we can remove moderating roles from the View object, and get them
directly using the group id when required.

Change-Id: I69f5cd467e474a1fd9c0c589322c6a3935aa3482
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

When creating a new BlockInstance object for a view, pass the view
object to the BlockInstance constructor when we already have it
handy.  This stops the BlockInstance from having to pull the view
out of the database again in its get_view method, and can save
several queries when rendering a view.

Change-Id: I717f154031794afec1ca0d353c1d358f297c5c1e
Signed-off-by: Richard Mansfield <richard.mansfield@catalyst.net.nz>

Merge changes I308cf44f,I21f8636e,I5214c5b0,I81b44928,I8725e566,I3ec7d13d,I3ec49f59,Ia1611a6a,I3f8a15de,I7e5e5ff8,Id2ef0453

* changes:
  Allow update of group note permissions (bug #736665)
  Show artefact owner when selecting html artefacts (bug #736665)
  When configuring a read-only textbox, allow copying (bug #736665)
  Display textbox notes as read-only in config form (bug #736665)
  Return sanitised copy of description from artefactchooser (bug #736665)
  Get editable status along with artefactchooser artefacts (bug #736665)
  Stop users from editing note text in the wrong context (bug #736665)
  Allow editing of a textbox block when artefact not found (bug #736665)
  User can_publish_artefact method too restrictive (bug #865911)
  Use artefact method to get user's edit/publish permissions
  Allow use of group_user_access when logged out