Uploaded image for project: 'Moodle'
  1. Moodle
  2. MDL-43398

Wiki: "Choose..." options cause SQL errors or seen inappropriate.

    Details

    • Type: Bug
    • Status: Closed
    • Priority: Minor
    • Resolution: Fixed
    • Affects Version/s: 2.4.7, 2.5.3, 2.6, 2.7
    • Fix Version/s: 2.5.6, 2.6.3
    • Component/s: Wiki (2.x)
    • Labels:
    • Testing Instructions:
      Hide

      a) in a wiki - collaborative: check that the selectbox in Map is defaulted to "page list" and you don't see "Choose..."
      b) in a wiki - collaborative: check that the selectbox in Administration is defaulted to "Remove pages" and you don't see "Choose..."
      c) wiki - view (individual - no group): the user/group select box has no "Choose..." option
      d) wiki - view (individual - separated group): the user/group select box has no "Choose..." option
      e) wiki - view (individual - visible group): the user/group select box has no "Choose..." option

      Show
      a) in a wiki - collaborative: check that the selectbox in Map is defaulted to "page list" and you don't see "Choose..." b) in a wiki - collaborative: check that the selectbox in Administration is defaulted to "Remove pages" and you don't see "Choose..." c) wiki - view (individual - no group): the user/group select box has no "Choose..." option d) wiki - view (individual - separated group): the user/group select box has no "Choose..." option e) wiki - view (individual - visible group): the user/group select box has no "Choose..." option
    • Affected Branches:
      MOODLE_24_STABLE, MOODLE_25_STABLE, MOODLE_26_STABLE, MOODLE_27_STABLE
    • Fixed Branches:
      MOODLE_25_STABLE, MOODLE_26_STABLE
    • Pull Master Branch:
      wip-MDL-43398-master

      Description

      wiki - map menu: "Choose..." displays the "page list", the default. No need the option.
      wiki - administration: "Choose..." displays "Remove pages", the default. No need the option.
      wiki - view (individual - no group): "Choose..." makes no sense, it should be default to the current user.
      wiki - view (individual - seperated group): design needs investigation - Selecting "Choose..." causes a SQL error. From the code there will always be a selected option, so removing the "Choose..." seems a good fix.
      wiki - view (individual - visible group): design needs investigation - Selecting "Choose..." causes a SQL error. From the code there will always be a selected option, so removing the "Choose..." seems a good fix.
      wiki - page_index(): the only call of this function is commented. Apparently it's an undone TODO - I wrote an issue for the wiki: MDL-43358. // @TODO: Fix call to wiki_get_subwiki_by_group

        Gliffy Diagrams

          Issue Links

            Activity

            Hide
            abgreeve Adrian Greeve added a comment -

            [Y] Syntax
            [Y] Whitespace
            [Y] Output
            [-] Language
            [-] Databases
            [Y] Testing (instructions and automated tests)
            [-] Security
            [-] Documentation
            [Y] Git
            [-] Third party code
            [Y] Sanity check

            Hello Jérôme,

            Everything here looks good. I only have one small thing to mention.
            If part a) of your testing instructions is correct, then perhaps you could make an addition, and change line 486 of mod/wiki/renderer.php to have a null at the end, like all of the other single_select elements.

            Thanks,

            Show
            abgreeve Adrian Greeve added a comment - [Y] Syntax [Y] Whitespace [Y] Output [-] Language [-] Databases [Y] Testing (instructions and automated tests) [-] Security [-] Documentation [Y] Git [-] Third party code [Y] Sanity check Hello Jérôme, Everything here looks good. I only have one small thing to mention. If part a) of your testing instructions is correct, then perhaps you could make an addition, and change line 486 of mod/wiki/renderer.php to have a null at the end, like all of the other single_select elements. Thanks,
            Hide
            marina Marina Glancy added a comment -

            I'm picking up this issue from Jerome who has left HQ.
            I added commit in each branch as Adrian suggested.
            Submitting for integration as it was already reviewed

            Show
            marina Marina Glancy added a comment - I'm picking up this issue from Jerome who has left HQ. I added commit in each branch as Adrian suggested. Submitting for integration as it was already reviewed
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week.

            TIA and ciao

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - The main moodle.git repository has just been updated with latest weekly modifications. You may wish to rebase your PULL branches to simplify history and avoid any possible merge conflicts. This would also make integrator's life easier next week. TIA and ciao
            Hide
            cibot CiBoT added a comment -

            Moving this issue to current integration cycle, will be reviewed soon. Thanks for the hard work!

            Show
            cibot CiBoT added a comment - Moving this issue to current integration cycle, will be reviewed soon. Thanks for the hard work!
            Hide
            stronk7 Eloy Lafuente (stronk7) added a comment -

            Integrated (25, 26 & master), thanks!

            Show
            stronk7 Eloy Lafuente (stronk7) added a comment - Integrated (25, 26 & master), thanks!
            Hide
            markn Mark Nelson added a comment -

            Works as expected, thanks Jerome and Marina.

            Show
            markn Mark Nelson added a comment - Works as expected, thanks Jerome and Marina.
            Hide
            marina Marina Glancy added a comment -

            Thanks for your hard work. Your code is now part of Moodle.

            Show
            marina Marina Glancy added a comment - Thanks for your hard work. Your code is now part of Moodle.

              People

              • Votes:
                0 Vote for this issue
                Watchers:
                4 Start watching this issue

                Dates

                • Created:
                  Updated:
                  Resolved:
                  Fix Release Date:
                  12/May/14