GitLab

Bug #1006634, part 3

These need to continue to use ids rather than clean urls, because
javascript on the page parses the href attribute for user and group
ids.  It's still better to use the appropriate url functions anyway,
to reduce the number of hardcoded urls.  Because clicks on these links
are intercepted by javascript to display a preview window, users will
not end up at these unclean urls unless they have disabled javascript.

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

Bug #1006634, part 3

The template can be simplified a bit by using View::display_title()
instead of generating titles and links for the view and its owner.

The owner_link function is called by display_title, and is updated
here to return clean urls.

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

Avoids double queries on view/view.php and view/artefact.php, where a
View object is constructed from an id inside can_view_view, and again
on the page.

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

Bug #1006634, part 3

- Releasing submitted views
- Display of view titles
- Redirects after submitting the objection form, and marking views as unobjectionable

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

Bug #1006634, part 3

Now uses View methods rather than a custom query.

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

Allowing the View::formatted_owner function to be called on
institution views will allow for simpler code where we have a mix of
views, and just want to get an owner name for each one.

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

This stops the empty href attribute being automatically filled with a
nonexistent clean url by the browser.

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

Bug #1006634, part 3

Use View methods instead of a custom query.

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

Bug #1006634, part 3

Views and artefacts are pulled from the db together in a UNION query.
We can't simply pass the whole list of records through to a View
method - it's easier to generate the urls one by one in
build_portfolio_search_html.

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

Bug #1006634, part 3

Changes to get_extra_view_info allow the following pages to be updated
with clean view urls, without any performance penalty:

- Latest pages block
- get_views_for_user mnet function
- Group views block
- My views block
- Sitemaps
- Shared pages

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

Bug #1006634, part 3

Simplifies get_myviews_data() to make use of get_extra_view_info, as
the results from that function now contain everything we need for
display on the page.

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

Bug #1006634, part 3

This function is used when a set of view records needs to be augmented
with tags and data about the view owner (user, group, or institution).
It is useful on many pages to add the url of each view into the set of
results, because the url can no longer be determined from the view id
alone.

To use the get_url() method, a temporary View object is created, and
this is prepopulated with the appropriate owner or group (which we
have already pulled from the db), so that later calls to
get_owner_object() and get_group_object() don't need to perform any
more queries.

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

Bug #1006634, part 3

The existing get_url method for views is modified to generate clean
profile and group homepage urls.

When the view is just a portfolio view, the view's urlid is appended
to the user or group url.  This requires calls to
View::get_owner_object() and View::get_group_object(), which are
potentially too slow to be calling on long lists of views, but this is
addressed in subsequent commits.

A flag is also added to force get_url to use old-style urls with ids.
Sometimes an id is required by existing javascript which parses an
href attribute.

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

Bug #1006634, part 3

The view_search() function retrieves data about the user or group who
owns each view in the result set, and this owner data is displayed in
the Group pages and Latest pages blocks, and Shared pages.  When the
urlid column is also pulled from the db, user and group urls can be
generated using the new functions.

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

Bug #1006634, part 3

In many places user urlids are not currently available when the
profile url is generated, but it is trivial to get it, and then change
the user/view.php url to a profile_url call:

- Admin page access report
- Profile links in feedback lists
- My friends block
- Wall posts
- Group members block
- Group members tab
- Recent forum posts block
- Group admin lists on forums page
- Group admin lists on my groups, find groups
- Group admin lists in group info block
- Profile sideblock
- My friends & find friends pages
- Institution landing page
- Online users page

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

Bug #1006634, part 3

In these cases the user's url field is already fetched on the page,
but the database query must be moved to make use of it.

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

Bug #1006634, part 3

Adds a new profile_url function which respects the cleanurls
configuration, and makes use of this function in many places where the
user's url field is already available:

- Admin user account settings page
- Redirects after inviting/adding users to groups
- Redirects & notifications after accepting/denying friend requests or unfriending
- The name plate in the top right header & small view header
- Online users sideblock
- Display of threaded personal messages

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

Bug #1006634, part 3

Replaces existing group/view.php urls with calls to
group_homepage_url, in a bunch of places where only a minor change is
required to fetch the urlid property, and where it is clear it will
have little impact on performance:

- My groups block
- Cancel button on group delete
- Redirects after joining a group or inviting a user
- Group tab of the admin stats area
- My groups section of the profile sideblock
- Redirect after submitting a view

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

Bug #1006634, part 3

Replaces a bunch of hardcoded group/view.php urls with calls to
group_homepage_url, in a few cases where it is obvious that the urlid
property is already part of the group object available at that point.

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

The returnto parameter is ignored in the form's submit function
group_view_submission_form_submit (this form used to appear on My
Views, and needed to remember where to redirect to).

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

Bug #1006634, part 3

Adds a new function to generate a group homepage url from a group
object, and uses this function instead of a hardcoded url in the group
lists on Find Groups and My Groups.

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

and change "Allows submissions" to "Allow submissions"
on the group edit screen but still leave it as "Allows
submissions on My / Find groups.

Change-Id: Iaf8b1f2dbe64726257fa88186681337f0c405c68
Signed-off-by: Kristina D.C. Hoeppner <kristina@catalyst.net.nz>

* changes:
  Preserve registration 'extra' values during approval (bug #1001064)
  Don't write logged out user preferences to the db (bug #1001064)
  Add local hooks for registration and user initialisation (bug #1001064)

* changes:
  Add config option to allow users to change their theme
  Add support in User for theme preference
  Gather themename, logo & stylesheets together in User object

While commit 0af8ce9e makes it so new copied
journals etc shouldn't get lost, there are accounts that had copied journals
from before commit 5e07db54 went into effect,
and are now hence hidden. This new commit works around that so that the option
to enable multiblogs is visible if it is somehow disabled for someone with
multiple journals, rather than just being ignored for everyone with multiple
journals. A discreet notice has been placed on /artefact/blog/view/ so that
the user knows.

Change-Id: I6d65aa934d3f3368083e55b21a30fb00d5a0c132