Details

    • Type: Improvement Improvement
    • Status: Closed
    • Priority: Trivial Trivial
    • Resolution: Fixed
    • Affects Version/s: 6.0
    • Fix Version/s: 5.2, 6.0
    • Component/s: web gui
    • Labels:
      None
    • Flags:
      Patch

      Description

      As discussed with steffkes on IRC

      1. SOLR-7409.patch
        8 kB
        Shawn Heisey
      2. SOLR-7409.patch
        7 kB
        Shawn Heisey
      3. SOLR-7409.patch
        7 kB
        Shawn Heisey
      4. SOLR-7409.patch
        7 kB
        Shawn Heisey
      5. SOLR-7409-1.patch
        0.4 kB
        Jellyfrog
      6. SOLR-7409-2.patch
        3 kB
        Jellyfrog

        Issue Links

          Activity

          Hide
          Jellyfrog added a comment - - edited

          Pick one of the patches only!

          Without any of the patches

          /dataimport37
          /dataimport38
          /dataimport35
          /dataimport36
          /dataimport39
          /dataimport40
          /dataimport41
          /dataimport44
          /dataimport45
          /dataimport42
          /dataimport43
          /dataimport26
          /dataimport27
          /dataimport24
          /dataimport25
          /dataimport28
          /dataimport29
          /dataimport30
          /dataimport33
          /dataimport34
          /dataimport31
          /dataimport32
          /dataimport59
          /dataimport57
          /dataimport58
          /dataimport6
          /dataimport7
          /dataimport8
          /dataimport9
          /dataimport62
          /dataimport63
          /dataimport0
          /dataimport60
          /dataimport1
          /dataimport61
          /dataimport2
          /dataimport66
          /dataimport3
          /dataimport67
          /dataimport4
          /dataimport64
          /dataimport5
          /dataimport65
          /dataimport48
          /dataimport49
          /dataimport46
          /dataimport47
          /dataimport51
          /dataimport52
          /dataimport50
          /dataimport55
          /dataimport56
          /dataimport53
          /dataimport54
          /dataimport68
          /dataimport69
          /dataimport15
          /dataimport16
          /dataimport13
          /dataimport14
          /dataimport19
          /dataimport17
          /dataimport18
          /dataimport22
          /dataimport23
          /dataimport20
          /dataimport21
          /dataimport11
          /dataimport12
          /dataimport10

          With SOLR-7409-1.patch

          /dataimport0
          /dataimport1
          /dataimport10
          /dataimport11
          /dataimport12
          /dataimport13
          /dataimport14
          /dataimport15
          /dataimport16
          /dataimport17
          /dataimport18
          /dataimport19
          /dataimport2
          /dataimport20
          /dataimport21
          /dataimport22
          /dataimport23
          /dataimport24
          /dataimport25
          /dataimport26
          /dataimport27
          /dataimport28
          /dataimport29
          /dataimport3
          /dataimport30
          /dataimport31
          /dataimport32
          /dataimport33
          /dataimport34
          /dataimport35
          /dataimport36
          /dataimport37
          /dataimport38
          /dataimport39
          /dataimport4
          /dataimport40
          /dataimport41
          /dataimport42
          /dataimport43
          /dataimport44
          /dataimport45
          /dataimport46
          /dataimport47
          /dataimport48
          /dataimport49
          /dataimport5
          /dataimport50
          /dataimport51
          /dataimport52
          /dataimport53
          /dataimport54
          /dataimport55
          /dataimport56
          /dataimport57
          /dataimport58
          /dataimport59
          /dataimport6
          /dataimport60
          /dataimport61
          /dataimport62
          /dataimport63
          /dataimport64
          /dataimport65
          /dataimport66
          /dataimport67
          /dataimport68
          /dataimport69
          /dataimport7
          /dataimport8
          /dataimport9

          With SOLR-7409-2.patch

          /dataimport0
          /dataimport1
          /dataimport2
          /dataimport3
          /dataimport4
          /dataimport5
          /dataimport6
          /dataimport7
          /dataimport8
          /dataimport9
          /dataimport10
          /dataimport11
          /dataimport12
          /dataimport13
          /dataimport14
          /dataimport15
          /dataimport16
          /dataimport17
          /dataimport18
          /dataimport19
          /dataimport20
          /dataimport21
          /dataimport22
          /dataimport23
          /dataimport24
          /dataimport25
          /dataimport26
          /dataimport27
          /dataimport28
          /dataimport29
          /dataimport30
          /dataimport31
          /dataimport32
          /dataimport33
          /dataimport34
          /dataimport35
          /dataimport36
          /dataimport37
          /dataimport38
          /dataimport39
          /dataimport40
          /dataimport41
          /dataimport42
          /dataimport43
          /dataimport44
          /dataimport45
          /dataimport46
          /dataimport47
          /dataimport48
          /dataimport49
          /dataimport50
          /dataimport51
          /dataimport52
          /dataimport53
          /dataimport54
          /dataimport55
          /dataimport56
          /dataimport57
          /dataimport58
          /dataimport59
          /dataimport60
          /dataimport61
          /dataimport62
          /dataimport63
          /dataimport64
          /dataimport65
          /dataimport66
          /dataimport67
          /dataimport68
          /dataimport69

          Show
          Jellyfrog added a comment - - edited Pick one of the patches only! Without any of the patches /dataimport37 /dataimport38 /dataimport35 /dataimport36 /dataimport39 /dataimport40 /dataimport41 /dataimport44 /dataimport45 /dataimport42 /dataimport43 /dataimport26 /dataimport27 /dataimport24 /dataimport25 /dataimport28 /dataimport29 /dataimport30 /dataimport33 /dataimport34 /dataimport31 /dataimport32 /dataimport59 /dataimport57 /dataimport58 /dataimport6 /dataimport7 /dataimport8 /dataimport9 /dataimport62 /dataimport63 /dataimport0 /dataimport60 /dataimport1 /dataimport61 /dataimport2 /dataimport66 /dataimport3 /dataimport67 /dataimport4 /dataimport64 /dataimport5 /dataimport65 /dataimport48 /dataimport49 /dataimport46 /dataimport47 /dataimport51 /dataimport52 /dataimport50 /dataimport55 /dataimport56 /dataimport53 /dataimport54 /dataimport68 /dataimport69 /dataimport15 /dataimport16 /dataimport13 /dataimport14 /dataimport19 /dataimport17 /dataimport18 /dataimport22 /dataimport23 /dataimport20 /dataimport21 /dataimport11 /dataimport12 /dataimport10 With SOLR-7409 -1.patch /dataimport0 /dataimport1 /dataimport10 /dataimport11 /dataimport12 /dataimport13 /dataimport14 /dataimport15 /dataimport16 /dataimport17 /dataimport18 /dataimport19 /dataimport2 /dataimport20 /dataimport21 /dataimport22 /dataimport23 /dataimport24 /dataimport25 /dataimport26 /dataimport27 /dataimport28 /dataimport29 /dataimport3 /dataimport30 /dataimport31 /dataimport32 /dataimport33 /dataimport34 /dataimport35 /dataimport36 /dataimport37 /dataimport38 /dataimport39 /dataimport4 /dataimport40 /dataimport41 /dataimport42 /dataimport43 /dataimport44 /dataimport45 /dataimport46 /dataimport47 /dataimport48 /dataimport49 /dataimport5 /dataimport50 /dataimport51 /dataimport52 /dataimport53 /dataimport54 /dataimport55 /dataimport56 /dataimport57 /dataimport58 /dataimport59 /dataimport6 /dataimport60 /dataimport61 /dataimport62 /dataimport63 /dataimport64 /dataimport65 /dataimport66 /dataimport67 /dataimport68 /dataimport69 /dataimport7 /dataimport8 /dataimport9 With SOLR-7409 -2.patch /dataimport0 /dataimport1 /dataimport2 /dataimport3 /dataimport4 /dataimport5 /dataimport6 /dataimport7 /dataimport8 /dataimport9 /dataimport10 /dataimport11 /dataimport12 /dataimport13 /dataimport14 /dataimport15 /dataimport16 /dataimport17 /dataimport18 /dataimport19 /dataimport20 /dataimport21 /dataimport22 /dataimport23 /dataimport24 /dataimport25 /dataimport26 /dataimport27 /dataimport28 /dataimport29 /dataimport30 /dataimport31 /dataimport32 /dataimport33 /dataimport34 /dataimport35 /dataimport36 /dataimport37 /dataimport38 /dataimport39 /dataimport40 /dataimport41 /dataimport42 /dataimport43 /dataimport44 /dataimport45 /dataimport46 /dataimport47 /dataimport48 /dataimport49 /dataimport50 /dataimport51 /dataimport52 /dataimport53 /dataimport54 /dataimport55 /dataimport56 /dataimport57 /dataimport58 /dataimport59 /dataimport60 /dataimport61 /dataimport62 /dataimport63 /dataimport64 /dataimport65 /dataimport66 /dataimport67 /dataimport68 /dataimport69
          Hide
          Shawn Heisey added a comment -

          That -2 patch looks really good.

          It looks like you re-used somebody else's code, specifically this project:

          https://github.com/overset/javascript-natural-sort/blob/master/naturalSort.js

          This isn't a problem. I believe we should probably use their source file which includes the author and the license, which is MIT, and compatible with Solr's license. I wonder if we need to include a license and notice file in solr/licenses for this code.

          Regarding patch attachments, normally they really should be just named after the issue, for every upload, which means they all get named SOLR-7409.patch. If I am making an alternate proposal on an issue that somebody else is working, I will sometimes do a name like SOLR-7409-elyograg.patch to keep it separate from the more official work in progress. Jira will automatically grey out all but the newest version of each attachment that has the same name, but the older ones will remain available. This is in line with the open source ideal of keeping all discussion and development in the public view.

          Show
          Shawn Heisey added a comment - That -2 patch looks really good. It looks like you re-used somebody else's code, specifically this project: https://github.com/overset/javascript-natural-sort/blob/master/naturalSort.js This isn't a problem. I believe we should probably use their source file which includes the author and the license, which is MIT, and compatible with Solr's license. I wonder if we need to include a license and notice file in solr/licenses for this code. Regarding patch attachments, normally they really should be just named after the issue, for every upload, which means they all get named SOLR-7409 .patch. If I am making an alternate proposal on an issue that somebody else is working, I will sometimes do a name like SOLR-7409 -elyograg.patch to keep it separate from the more official work in progress. Jira will automatically grey out all but the newest version of each attachment that has the same name, but the older ones will remain available. This is in line with the open source ideal of keeping all discussion and development in the public view.
          Hide
          Shawn Heisey added a comment -

          New version of patch with CHANGES.txt, license, notice, and the source file from the naturalsort project with author and license.

          Jellyfrog, does the credit in CHANGES.txt look OK to you, or would you like it to say something else?

          Fellow committers, does all this look OK? I'm particularly concerned to make sure I'm handling the licensing issues properly, to keep the project out of legal trouble.

          Show
          Shawn Heisey added a comment - New version of patch with CHANGES.txt, license, notice, and the source file from the naturalsort project with author and license. Jellyfrog , does the credit in CHANGES.txt look OK to you, or would you like it to say something else? Fellow committers, does all this look OK? I'm particularly concerned to make sure I'm handling the licensing issues properly, to keep the project out of legal trouble.
          Hide
          Jellyfrog added a comment -

          Fine for me!

          Its acutely this fork; https://github.com/jarinudom/naturalSort.js btw.

          Show
          Jellyfrog added a comment - Fine for me! Its acutely this fork; https://github.com/jarinudom/naturalSort.js btw.
          Hide
          Shawn Heisey added a comment - - edited

          I didn't look at the differences between those two javascript files, but I can see that there ARE differences, so I grabbed the version of naturalSort.js found in the fork you linked. New patch with those changes. This resulted in a minor change to the license file as well – this version has an actual copyright year, before I guessed 2012 because that's when the last commit to the repo was.

          Show
          Shawn Heisey added a comment - - edited I didn't look at the differences between those two javascript files, but I can see that there ARE differences, so I grabbed the version of naturalSort.js found in the fork you linked. New patch with those changes. This resulted in a minor change to the license file as well – this version has an actual copyright year, before I guessed 2012 because that's when the last commit to the repo was.
          Hide
          Shawn Heisey added a comment -

          Slight patch modification. I grabbed the actual LICENSE file from the github fork and put it in as the license file in the patch. The previous version was copied from another MIT license file already included in solr/licenses.

          Show
          Shawn Heisey added a comment - Slight patch modification. I grabbed the actual LICENSE file from the github fork and put it in as the license file in the patch. The previous version was copied from another MIT license file already included in solr/licenses.
          Hide
          Shawn Heisey added a comment -

          On precommit, it seems that rat requires a license header in the .js source file. I have added one with the MIT license. Once precommit passes, I will upload a new patch.

          Show
          Shawn Heisey added a comment - On precommit, it seems that rat requires a license header in the .js source file. I have added one with the MIT license. Once precommit passes, I will upload a new patch.
          Hide
          Shawn Heisey added a comment -

          Tests and precommit pass with this patch.

          Show
          Shawn Heisey added a comment - Tests and precommit pass with this patch.
          Hide
          ASF subversion and git services added a comment -

          Commit 1677365 from Shawn Heisey in branch 'dev/trunk'
          [ https://svn.apache.org/r1677365 ]

          SOLR-7409: Sort datimport handlers in the admin UI

          Show
          ASF subversion and git services added a comment - Commit 1677365 from Shawn Heisey in branch 'dev/trunk' [ https://svn.apache.org/r1677365 ] SOLR-7409 : Sort datimport handlers in the admin UI
          Hide
          ASF subversion and git services added a comment -

          Commit 1677366 from Shawn Heisey in branch 'dev/branches/branch_5x'
          [ https://svn.apache.org/r1677366 ]

          SOLR-7409: Sort datimport handlers in the admin UI (backport trunk r1677365)

          Show
          ASF subversion and git services added a comment - Commit 1677366 from Shawn Heisey in branch 'dev/branches/branch_5x' [ https://svn.apache.org/r1677366 ] SOLR-7409 : Sort datimport handlers in the admin UI (backport trunk r1677365)
          Hide
          ASF subversion and git services added a comment -

          Commit 1684234 from Shawn Heisey in branch 'dev/trunk'
          [ https://svn.apache.org/r1684234 ]

          SOLR-7588: Fix javascript bug introduced by SOLR-7409 that broke dataimport in admin UI.

          Show
          ASF subversion and git services added a comment - Commit 1684234 from Shawn Heisey in branch 'dev/trunk' [ https://svn.apache.org/r1684234 ] SOLR-7588 : Fix javascript bug introduced by SOLR-7409 that broke dataimport in admin UI.
          Hide
          ASF subversion and git services added a comment -

          Commit 1684235 from Shawn Heisey in branch 'dev/branches/branch_5x'
          [ https://svn.apache.org/r1684235 ]

          SOLR-7588: Fix javascript bug introduced by SOLR-7409 that broke dataimport in admin UI. (merge trunk r1684234)

          Show
          ASF subversion and git services added a comment - Commit 1684235 from Shawn Heisey in branch 'dev/branches/branch_5x' [ https://svn.apache.org/r1684235 ] SOLR-7588 : Fix javascript bug introduced by SOLR-7409 that broke dataimport in admin UI. (merge trunk r1684234)
          Hide
          ASF subversion and git services added a comment -

          Commit 1684236 from Shawn Heisey in branch 'dev/branches/lucene_solr_5_2'
          [ https://svn.apache.org/r1684236 ]

          SOLR-7588: Fix javascript bug introduced by SOLR-7409 that broke dataimport in admin UI. (merge trunk r1684234)

          Show
          ASF subversion and git services added a comment - Commit 1684236 from Shawn Heisey in branch 'dev/branches/lucene_solr_5_2' [ https://svn.apache.org/r1684236 ] SOLR-7588 : Fix javascript bug introduced by SOLR-7409 that broke dataimport in admin UI. (merge trunk r1684234)
          Hide
          Anshum Gupta added a comment -

          Bulk close for 5.2.0.

          Show
          Anshum Gupta added a comment - Bulk close for 5.2.0.

            People

            • Assignee:
              Unassigned
              Reporter:
              Jellyfrog
            • Votes:
              1 Vote for this issue
              Watchers:
              5 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Development