- 08 Jun, 2012 40 commits
-
-
Richard Mansfield authored
Bug #1006634, part 3 This is the destination for the "Done" button at the bottom of the block editing page. Change-Id: I0ecb734af6370865832a538e289d919f6cfbea93 Signed-off-by:Richard Mansfield <richard.mansfield@catalyst.net.nz>
-
Richard Mansfield authored
Change-Id: I221a5a57059b78b6241c88e006cd496284d94a6e Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Adds the url id to the information returned by search_group, and passes this into the javascript in the "Share with other users and groups" fieldset on the Edit access page. Change-Id: Ie5b88afba4a76bdae8d150452dbae7daed61471d Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 In fact, this url was previously unused, because the $redirecturl variable was being clobbered immediately after the view type test. Change-Id: If8695b5750599ba9ea0c62fc07f5625eafe1216a Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 For the text under views that have been submitted to groups on Portfolio -> Pages. Change-Id: Id6a0d193e0379d2aa7dea715ac2d38ddc3f082dc Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 For the linked group names listed in Groups -> Topics Change-Id: I7cf0105ec08f8025568ea2ae83218b9a68e85500 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Adds the profile url to the information returned by search_user, and passes this into the javascript in the "Share with other users and groups" fieldset on the Edit access page. Change-Id: I9dc34ce94c30d8ed14464ad518e2b9cab02f4db9 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Because the urlid field is required here, this patch also modifies the block to use the display_name function rather than firstname and lastname. Change-Id: Ie24a5bfa51595da9a063e23aae98420ca93fc7f4 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 For user and group links under "Access list" on the share tab. Change-Id: I48f0f78cf3741b0afac66da4c20df3f7184f83d7 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 This is used when configuring a textbox block, and the user has access to 'note' artefacts with a different owner. For example, when adding a group or institution note into a personal view. Change-Id: I80259c769d71982f75c620b0954aa4227042cb62 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 These changes will call profile_url on user ids rather than user records or objects, but this will not result in any additional queries on these pages: the users are (unfortunately) already being fetched one by one to run display_name. Change-Id: Ia744e06fcbf761310f43461479ea1f345ea04c62 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 This is more efficient on many pages, because the user object has already been fetched, or is about to be fetched, to run display_name or profile_icon_url. However, user object returned by get_user_for_display won't allow can_view_view to tell whether a user is suspended or not, so suspendedctime is added to this object (it's less identifying than suspendedcusr). Change-Id: Ic9d1e5d437aedbc45f6328a05997812dcf45c8d6 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 This is for the anecdotal snippets like 'Most is Bob with 55', etc. Change-Id: If353facdab7a18da46ccd5d499ccde325815ae85 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Change-Id: I643746b18d01fa90c8d31571fd6fc3c30c97e04b Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Passes the view records through get_extra_view_info. Change-Id: Ic9b108f4c5814022446f6c4e4e8ea54bfc74cd31 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Passes the view records through get_extra_view_info. Change-Id: I71fbf2e56bee243a1cd4590aefaa3a0ebfe3841d Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Use the global $submittedgroup in releaseview_submit() - it already contains the group record. Change-Id: I3ad549cd8f0581251ded9d315cf3b5cc90e724ee Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Modifies the page to use a View object rather than a db record, so that get_url can be used. Change-Id: Idd92be967469cb9a0e06a2f0ebd8d1bcdbf7325a Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Simplifies the view query and passes the results through get_extra_view_info to pull out the urls. Change-Id: I8c39548b00b02634193e78fb72ff0e5d4215ce68 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 In order to get the url information for the list of views returned by get_views(), that function is modified to gather the views in a single flat list rather than in a structure indexed by user id. Just before the view list is returned, the url information is fetched and the user array is built. Change-Id: I12dad07c90f8c51614e72c7402c63dc38fccceeb Signed-off-by: -
Richard Mansfield authored
On these pages, user views were being fetched along with each user, but because the view lists are never displayed, they don't need to be queried. Change-Id: Ic3b9888de1abacdddc01853123bca29e3bf23901 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Updates the Collection::views() method to get a url along with each view, and uses these in the templates related to collections. Also gets the maximum and minimum displayorder fields by iterating over returned records instead of performing additional queries. Change-Id: Ia115f6057854f5746cc3c873b79324198089252a Signed-off-by: -
Richard Mansfield authored
In many places get_extra_view_info is used when a user is searching their own views. In these cases the user record is already easily available, and we don't need to query it again. The tags query is also made optional. Change-Id: Ib18ab9029c0bc243f92c763ac1ccf24b8d69ac17 Signed-off-by: -
Richard Mansfield authored
Bug #1006634, part 3 Only affects views that the owner has tagged 'profile'. Change-Id: Id4a6b641ab46e6cf105d9dbf295fb16f8d343987 Signed-off-by: -
Richard Mansfield authored
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 authored
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 authored
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 authored
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 authored
Bug #1006634, part 3 Now uses View methods rather than a custom query. Change-Id: I227652f197b488b0a98c442cbed8a359dd00e9f8 Signed-off-by: -
Richard Mansfield authored
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 authored
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 authored
Bug #1006634, part 3 Use View methods instead of a custom query. Change-Id: I2fb2eaa0d1cdbee29cb3e3a2a56448ef3ad89374 Signed-off-by: -
Richard Mansfield authored
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 authored
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 authored
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 authored
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 authored
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 authored
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 authored
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 authored
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:
-
