Fixed issue#2445 added both direction sort order #2557

sukhbir-singh · 2018-03-29T14:32:18Z

Fixes issue #2445
Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
code is in uniquely-named feature branch and has no merge conflicts
PR is descriptively titled
PR body includes fixes #0000-style reference to original issue #
ask @publiclab/reviewers for help, in a comment below
Thanks!

PublicLabBot · 2018-03-29T14:41:56Z

	1 Warning
⚠️	It looks like you merged from master in this pull request. Please rebase to get rid of the merge commits – you may want to rewind the master branch and rebase instead of merging in from master, which can cause problems when accepting new code!

	1 Message
📖	@sukhbir-singh Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.

Generated by 🚫 Danger

shauncarland-old-account

Added a few comments. This is my first time reviewing something from this project so I might be missing a little bit of context...but I feel confident with my feedback.

Also, can you please write unit tests for this? e.g. determine that when the order_string is descending, you are getting back tags for uses in the correct order?

:D

shauncarland-old-account · 2018-03-31T15:34:18Z

app/controllers/tag_controller.rb

@@ -11,6 +11,12 @@ def index

    @title = I18n.t('tag_controller.tags')
    @paginated = true
+
+    order_string = "count DESC"


I would put this into a private method within the controller. e.g.

def order_string params[:order] === "asc" ? "count ASC" : "count DESC" end private :order_string

shauncarland-old-account · 2018-03-31T15:35:13Z

app/views/tag/index.html.erb

@@ -21,8 +21,12 @@

  <table class="table">
    <tr>
-      <th><a href = "<%= tags_path %>?sort=name"><%= t('tag.index.tag') %></a> <i class="fa fa-arrows-v"></i></th>
-      <th><a href = "<%= tags_path %>?sort=uses"><%= t('tag.index.number_of_uses') %></a> <i class="fa fa-arrows-v"></i></th>
+      <% order_type = "desc" %>


Can we set order_type in the controller like we're setting @tags? I think the controller would be a better place to do that. In general, from my understanding, logic should be kept out as much as possible from the ERB template. It should primarily stay in the controller and model.

shauncarland-old-account · 2018-03-31T15:36:26Z

app/controllers/tag_controller.rb

      .paginate(page: params[:page], per_page: 24)
    elsif @toggle == "name"
+    order_string = "name DESC"


Yeah, if you do what I was saying, creating a function for defining order_string, this would be come more DRY. 🎉

shauncarland-old-account · 2018-03-31T15:36:38Z

app/controllers/tag_controller.rb

      .paginate(page: params[:page], per_page: 24)
    else
+      order_string = "name DESC"


sukhbir-singh · 2018-04-02T22:40:46Z

@shauncarland I have made all the required changes. so please review again.
I will keep the DRY thing in mind while making further contributions to public labs. 😄

jywarren · 2018-04-03T00:35:35Z

This looks good, can I get one more +1 from @publiclab/reviewers? And thank you @shauncarland, are you interested in being a reviewer? If so would you mind reading over http://publiclab.org/software-outreach? Cool!!

shauncarland-old-account · 2018-04-03T00:53:47Z

app/controllers/tag_controller.rb

+      params[:order] == "asc" ? "name ASC" : "name DESC"
+    end
+  end
+


[nit] extra line

shauncarland-old-account · 2018-04-03T00:54:17Z

app/controllers/tag_controller.rb

@@ -11,6 +11,10 @@ def index

    @title = I18n.t('tag_controller.tags')
    @paginated = true
+    @order_type = params[:order] == "desc" ? "asc" : "desc"
+
+    order_string = get_order_string()


[nit] you don't need a () after a method invocation in ruby, unless you are passing in arguments. :)

Also, I would just rename get_order_string and replace that function with order_string.

e.g.

def order_string ... end

Because ruby methods are invoked simply by calling them, you can keep the order_string the same as below. all order_string will do there is call the order_string function, returning the order string. thus, there is no need to assign the value of get_order_string to a variable. just call that function, wherever you were using a variable, order_string.

Does that make sense? It's a little bit hard to explain, but im happy to go further in detail if you need it. :)

(and make sure to keep order_string a private method! :D )

The idea of removing get_order_string and directly calling order_string is really cool 😎 Thanks !!

shauncarland-old-account · 2018-04-03T01:01:44Z

Good job keeping the code DRYer @sukhbir-singh! DRY is a good practice to keep in mind, whether you're working in this repo or in another one. Here's a good resource on why DRY is important: https://softwareengineering.stackexchange.com/questions/103233/why-is-dry-important

shauncarland-old-account · 2018-04-03T01:08:05Z

app/controllers/tag_controller.rb

@@ -11,6 +11,10 @@ def index

    @title = I18n.t('tag_controller.tags')
    @paginated = true
+    @order_type = params[:order] == "desc" ? "asc" : "desc"


I'm a little bit confused... if the order param is desc, we want to set the @order_type to desc...?

@shauncarland The logic behind this is that, we have to invert the order when a user click on sorting header again. So lets say if current shown order is according to "name descending" then we want front end to request on url with order type be ascending (opposite of descending). I hope you got my point 😄

🎉 🎉 🎉 🎉 🎉 🎉

sukhbir-singh · 2018-04-03T22:53:24Z

@shauncarland @jywarren I did all the remaining changes to this PR. Please review !!

shauncarland-old-account · 2018-04-04T01:49:04Z

app/controllers/tag_controller.rb

@@ -436,4 +438,14 @@ def location_modal
  def gridsEmbed
    render layout: false
  end
+
+  private


I would just do private :order_string at the end of the order_string method. That will make order_string private. The way you have it now, anything method below this line will be private. Let's just make order_string private so no future developer needs to worry about it. :)

But all other controllers in this project have used same pattern to specify private methods in a class. Please check out the home_controller.rb, application_controller.rb files, etc. So i think its better to do it the same way as other classes have used. 😅

shauncarland-old-account

One more thing about making order_string private but otherwise this looks good to me! great job 🥇🥇🥇

ebarry · 2018-04-17T16:00:52Z

I'm so excited to have this code running live on the website soon!

jywarren · 2018-06-07T22:28:18Z

Looks great! Completed!!! Thanks everybody :-)

* fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller

* Routes modified * Set the views * Modified error messages and user_tag * Add User_Tag as identity and find user_tag * User_sessions_controller modified * User_tag modified * user session controller modified * Checkpoint 1 * checkpoint1 codeclimate errors fixed * Checkpoint 2 * checkpoint 2 * User is created from sign up process successfully * create a usertag_with_omniauth * Search a usertag for oauth * search user_tag existing in db * create a user with omniauth test * LOGIN WORKS * current_user=(user) method removed * sign up correction * routing tests for google oauth * Google auth details saved * Google should return omniauth hash test * sign up and login via provider * sign up and login via provider alternative flow * flash message test added * login user with an email and then connect google provider * . * Changes according to rails 5 done * Changes according to rails 5 done * Environment nomenclature updated * Comments added * Adding application.yml * Submitting a draft (#2747) * Checkbox and JS function added * publish_draft method, routes, mail_notify_stop * coauthor can see and publish * bower update * undo and trying * draft label on dashboard * draft option not visible to first timer * updating bower * debug1 * removing debug statement * button view * view 2 * normal * generate path added * publish privil update * code climate * displaying comment with status1 only * coauthor can view draft * test correction * button text change to save if draft * fixture addition and 1 test * tests , fixtures and minor changes * test addition * codeclimate 1 * codeclimate 2 * codeclimate 3 * minor fixes * enable method=post for data-url image upload at /post (#2675) * enable method=post for data-url image upload at /post * Update editor_controller.rb * Update editor_controller.rb * Fixed first part of Issue #2352 Sorting headers added in wiki index page (#2353) * sorting headers added in wiki index page * replaced sorting header icon * Improved translate widget (#2553) * enhanced translate widget * changed title formatting of widget * Fix the clone command (#2766) * List subscription change (#2767) * Add sidekiq gem (#2738) * added resque gem * made changes for resqu installation * added sidekiq gem * minor changes * modified docker-compose.yml for redis * minor changes * resolve conflicts * Place tag detection and replacing "-" with "" (#2734) * Place tag detection and replacing "-" with "" * Javascript changed * Geocode method added * Tweaks * Tweaks * Tweaks * Tweaks 2 * Tweaks 3 * Update Gemfile.lock * Climate fix * add geocoded tags * Tweaks * Block shift and callback to onComplete * onComplete binded with ajax * place in starting of tag detection * Tweaks * make descriptive tag links move to bottom of page (#2770) * skylight config (#2773) * Reply to comment by email feature (#2669) * Added mailman script * Added migration file for adding comment_via column to comment table * Added reverse_markdown gem for converting html to markdown format * Added migration file for adding message_id column to comment table * Added function to handle received mail to create comment * Added icon for comment added via email to distinguish between the normal comment and reply by email comment * Added node_id in Mailer subjects to be used in reply by email feature * Minor changes * Updated schema.rb.example file * Improved tests * Added migrations * Added migrations * Added migrations * Corrected tests * Added enviroment variable for server address * Added sql sphefic conditions * Unwanted changes in schema.rb.example file is removed * Gem added * Log file is moved to public folder * Corrected tests * forward-date timestamps * Rename 20180605190014_add_message_id_column_to_comments.rb to 20180605010014_add_message_id_column_to_comments.rb * Update schema.rb.example * Added whenever cron update command in Makefile for redeploy-container (#2780) * Fix rss images and email images (#2784) * Fix rss images and email images * Update rss.rss.builder * Update rss_for_tagged_with_author.rss.builder * Update rss.rss.builder * Update rss.rss.builder * Update notify_node_creation.html.erb * Rails 5.0 upgrade (#2726) (#2783) * Rails 5.0 upgrade (#2726) * Upgraded the .gitignore according to rails diff * Initial Gemfile update * Update README.md * Showing message at the top of upgrade page (#2713) * added an upgrade alert tag * Additional questions page tweak (#2721) * added the tag to determine which upgrade is listed on the website * changed regex back * added an upgrade alert tag * added the tag to determine which upgrade is listed on the website * changed regex back * added upgrade after pull and rebase master * Upgrade to Rails 5 * Uncommented composite_primary_key gem * Removed the dual occurence of rails_autolink * Update readme installation, fixes #2729 (#2730) Updates the readme to change the installation instructions, fixes #2729 * Commented activerecord-tableless * Draft display on Dashboard (#2666) * draft display on dashboard * moderator file view permitted * checking * fix * test fix * Added and modified few config files according to railsdiff.org * Removed mass_assignment_sanitizer * Removed composite primary key gem * Removed all attr_accessible in all models * Added composite_primary_key gem again * Downgraded rails and removed few attr_accessible commands * Added strong parameters to the controllers * Added strong parameters gem and also include params.require inside private methods * Added strongparameters.rb file to initializers folder * Removed unnecessary strong_parameter functions * Removed some errors * Changed test command temporarily in .travis.yml * Corrected config/puma.rb file with adding some assets * Added all the config.precompile files in one line * Removed error of problem in updating of user profile * Removed the error while creating a user * Removed error RecordNotFound: Couldn't find Node with 'nid'= * Removed some errors related to ids * Removed comment.reload in comment_controller_test * Track Dockerfiles accross instances. (#2593) * Track Dockerfiles accross instances. * Specify jessie as base * Add commands to build&deploy container with Makefile. (#2746) * Added Sample Cron Job to check working of Whenever Gem (#2715) * Added Sample Cron Job to test Whenever Gem * Added make targets for deployment and cron service start * Added make to image * Tweak Makefile * Fix cron starting command in Makefile * Trim whitespace * Explicitly set jessie as base container * Fixed codeclimate issues * Auto-set wiki slug (#2743) * Added keyword arguments to the tag_model.rb * changed the query statement in search method of node.rb * Force removal of pid file (see docker/compose#1393) * Updated the tests due to change in arguments of search function in node.rb * Removed all the failures from tag_controller_test.rb * Changed the style of params in notes_controller_test.rb * Removed all depreciation warnings related to notes_controller * Removed all deprecation warnings related to image_controller and answers_controller * Removed all deprecation warnings of like_controller and fixed syntax error of answer_controller_test.rb * Removed all dep warnings of editor_controller and syntax error of like_controller_test.rb * removed all errors of answer_controller and some errors of tag_controller.rb * Removed all dep warnings of tag_controller_test.rb * Removed several dep warnings * Removed dep warnings of wiki_controller * Removed dep warnings of talk_controller * Removed dep warnings of legacy_controller_test.rb * Removed some warnings related to comment_controller * Removed the syntax errors * Removed two failures regarding application/xml+rss * Removed 2 failures due to wrong way of passing parameters in tests * Removed 2 failures * Fix params * Remove deprecations * Removed some dep warnings * Remove deprecations * Reverted to nothing => true * Reverted to nothing => true * Avoid rendering more than once in the same action * Removed all dep warnings related to user_tags_controller_test * Remove deprecation * Removed Dep warnings * Fix deprecation * Replace before_filter * Remove deprecation * Remove deprecation * Remove deprecation * Remove deprecation * Bump Ruby version to match Travis' * Simplify email regex to work with Ruby 2.4.1 * Changed the ruby version in Dockerfile * Remove deprecation * Remove deprecation * Removed the depreciation warning related to dynamic :controller and :action segment in routes * Changed the default ActiveRecord to ApplicationRecord in models * Clean Gemfile * Reverted to ['nid'] in tag_controller_test.rb * Changed the tests to rake test:all in .travis.yml * Minor spacing correction in .travis.yml * added a commit in application.js an application.css regarding the precompilation of files * Added more indentation * Small fixes * Separated the rails test and jasmine and coveralls task * Modified ['nid'] to ['node']['nid'] * Removed the extra puts in Rakefile * Changed the serial of tests * Added rake/testtask to Rakefile * Removed puma * Changed to ruby 2.4.1-jessie * Removed the whitelist_attributes command from config/application.rb * Removed two failures due to old usage of params * Fixed some new deprecation warnigs introduced * fixes #2731 'add spam button,line 16 _answers.html.erb' (#2785) * add spam button,line 16 _answers.html.erb * changed comment.ids to answer.ids * changed from comment path to answer * changed comment.parent.path to answer.path * some more cleanup to the button * change answer.aid to answer id * First timers recaptcha Environment Variables (#2786) * Edited the if statement * Added the env variables * Edited ENV variable, and added fallback * Fixed issue#2445 added both direction sort order (#2557) * fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller * Changed get to post (#2788) * Update container definitions to match actual files used. (#2791) * Update container definitions to match actual files used. * Fix paths for running docker-compose.yml from subdir * Fix reference to Dockerfile * Reformat range stats page to table (#2792) * Index page listing for UserTags per issue #2741. (#2753) * Index page listing for UserTags per issue #2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Tests rewritten after rebase. * Index page listing for UserTags per issue #2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Fix for test of sort by value. * Update routes.rb for wiki update (#2804) * Update routes.rb * fixes * integration tests for assets (#2806) * integration tests for assets * full assets included * Update assets.rb * Added routes to notes/edit (#2808) * Added routes to notes/edit * Removed redundant notes#edit and added get instead of post in edit actions * Update routes.rb (#2810) * Create OPENID.md * fixing error in home_controller related to `group by` (#2794) * Added group by note.nid * correction * Openid fix with post route and better alert texts (#2815) * Added group by note.nid * correction * reworded openid requests and added post method for 2nd step * adjust message * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update Dangerfile (#2816) * Update routes.rb to fix embeddable features (#2818) * Update routes.rb * Removed the apostrophe mismatch * Added tests for embed in feature * Delete route for notes (#2820) * Documentation for the reply-by-email to comment feature (#2774) * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Re-order comment options and messages (#2834) * Update _comment.html.erb * Update _comment.html.erb * encoding issue resolved for migrating DrupalUsers to User records (#2257) * encoding issue solved fixes #2209 * minor changes * Rename 20180206161706_add_user_for_orphaned_drupal_user.rb to 20180614000000_add_user_for_orphaned_drupal_user.rb * resolves issue 2520 (#2831) * Emoji autocomplete (#2832) * basic emoji autocomplete * minor changes * minor tweaks * code climate fixes * minor change * changes * remove unnecessary style * Fix parent powertags for wikis like /barnraising (#2844) * application.yml added * Views removed * Application.yml removed * application removed * Docker changes * sign up page removed

* fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller

* Routes modified * Set the views * Modified error messages and user_tag * Add User_Tag as identity and find user_tag * User_sessions_controller modified * User_tag modified * user session controller modified * Checkpoint 1 * checkpoint1 codeclimate errors fixed * Checkpoint 2 * checkpoint 2 * User is created from sign up process successfully * create a usertag_with_omniauth * Search a usertag for oauth * search user_tag existing in db * create a user with omniauth test * LOGIN WORKS * current_user=(user) method removed * sign up correction * routing tests for google oauth * Google auth details saved * Google should return omniauth hash test * sign up and login via provider * sign up and login via provider alternative flow * flash message test added * login user with an email and then connect google provider * . * Changes according to rails 5 done * Changes according to rails 5 done * Environment nomenclature updated * Comments added * Adding application.yml * Submitting a draft (publiclab#2747) * Checkbox and JS function added * publish_draft method, routes, mail_notify_stop * coauthor can see and publish * bower update * undo and trying * draft label on dashboard * draft option not visible to first timer * updating bower * debug1 * removing debug statement * button view * view 2 * normal * generate path added * publish privil update * code climate * displaying comment with status1 only * coauthor can view draft * test correction * button text change to save if draft * fixture addition and 1 test * tests , fixtures and minor changes * test addition * codeclimate 1 * codeclimate 2 * codeclimate 3 * minor fixes * enable method=post for data-url image upload at /post (publiclab#2675) * enable method=post for data-url image upload at /post * Update editor_controller.rb * Update editor_controller.rb * Fixed first part of Issue publiclab#2352 Sorting headers added in wiki index page (publiclab#2353) * sorting headers added in wiki index page * replaced sorting header icon * Improved translate widget (publiclab#2553) * enhanced translate widget * changed title formatting of widget * Fix the clone command (publiclab#2766) * List subscription change (publiclab#2767) * Add sidekiq gem (publiclab#2738) * added resque gem * made changes for resqu installation * added sidekiq gem * minor changes * modified docker-compose.yml for redis * minor changes * resolve conflicts * Place tag detection and replacing "-" with "" (publiclab#2734) * Place tag detection and replacing "-" with "" * Javascript changed * Geocode method added * Tweaks * Tweaks * Tweaks * Tweaks 2 * Tweaks 3 * Update Gemfile.lock * Climate fix * add geocoded tags * Tweaks * Block shift and callback to onComplete * onComplete binded with ajax * place in starting of tag detection * Tweaks * make descriptive tag links move to bottom of page (publiclab#2770) * skylight config (publiclab#2773) * Reply to comment by email feature (publiclab#2669) * Added mailman script * Added migration file for adding comment_via column to comment table * Added reverse_markdown gem for converting html to markdown format * Added migration file for adding message_id column to comment table * Added function to handle received mail to create comment * Added icon for comment added via email to distinguish between the normal comment and reply by email comment * Added node_id in Mailer subjects to be used in reply by email feature * Minor changes * Updated schema.rb.example file * Improved tests * Added migrations * Added migrations * Added migrations * Corrected tests * Added enviroment variable for server address * Added sql sphefic conditions * Unwanted changes in schema.rb.example file is removed * Gem added * Log file is moved to public folder * Corrected tests * forward-date timestamps * Rename 20180605190014_add_message_id_column_to_comments.rb to 20180605010014_add_message_id_column_to_comments.rb * Update schema.rb.example * Added whenever cron update command in Makefile for redeploy-container (publiclab#2780) * Fix rss images and email images (publiclab#2784) * Fix rss images and email images * Update rss.rss.builder * Update rss_for_tagged_with_author.rss.builder * Update rss.rss.builder * Update rss.rss.builder * Update notify_node_creation.html.erb * Rails 5.0 upgrade (publiclab#2726) (publiclab#2783) * Rails 5.0 upgrade (publiclab#2726) * Upgraded the .gitignore according to rails diff * Initial Gemfile update * Update README.md * Showing message at the top of upgrade page (publiclab#2713) * added an upgrade alert tag * Additional questions page tweak (publiclab#2721) * added the tag to determine which upgrade is listed on the website * changed regex back * added an upgrade alert tag * added the tag to determine which upgrade is listed on the website * changed regex back * added upgrade after pull and rebase master * Upgrade to Rails 5 * Uncommented composite_primary_key gem * Removed the dual occurence of rails_autolink * Update readme installation, fixes publiclab#2729 (publiclab#2730) Updates the readme to change the installation instructions, fixes publiclab#2729 * Commented activerecord-tableless * Draft display on Dashboard (publiclab#2666) * draft display on dashboard * moderator file view permitted * checking * fix * test fix * Added and modified few config files according to railsdiff.org * Removed mass_assignment_sanitizer * Removed composite primary key gem * Removed all attr_accessible in all models * Added composite_primary_key gem again * Downgraded rails and removed few attr_accessible commands * Added strong parameters to the controllers * Added strong parameters gem and also include params.require inside private methods * Added strongparameters.rb file to initializers folder * Removed unnecessary strong_parameter functions * Removed some errors * Changed test command temporarily in .travis.yml * Corrected config/puma.rb file with adding some assets * Added all the config.precompile files in one line * Removed error of problem in updating of user profile * Removed the error while creating a user * Removed error RecordNotFound: Couldn't find Node with 'nid'= * Removed some errors related to ids * Removed comment.reload in comment_controller_test * Track Dockerfiles accross instances. (publiclab#2593) * Track Dockerfiles accross instances. * Specify jessie as base * Add commands to build&deploy container with Makefile. (publiclab#2746) * Added Sample Cron Job to check working of Whenever Gem (publiclab#2715) * Added Sample Cron Job to test Whenever Gem * Added make targets for deployment and cron service start * Added make to image * Tweak Makefile * Fix cron starting command in Makefile * Trim whitespace * Explicitly set jessie as base container * Fixed codeclimate issues * Auto-set wiki slug (publiclab#2743) * Added keyword arguments to the tag_model.rb * changed the query statement in search method of node.rb * Force removal of pid file (see docker/compose#1393) * Updated the tests due to change in arguments of search function in node.rb * Removed all the failures from tag_controller_test.rb * Changed the style of params in notes_controller_test.rb * Removed all depreciation warnings related to notes_controller * Removed all deprecation warnings related to image_controller and answers_controller * Removed all deprecation warnings of like_controller and fixed syntax error of answer_controller_test.rb * Removed all dep warnings of editor_controller and syntax error of like_controller_test.rb * removed all errors of answer_controller and some errors of tag_controller.rb * Removed all dep warnings of tag_controller_test.rb * Removed several dep warnings * Removed dep warnings of wiki_controller * Removed dep warnings of talk_controller * Removed dep warnings of legacy_controller_test.rb * Removed some warnings related to comment_controller * Removed the syntax errors * Removed two failures regarding application/xml+rss * Removed 2 failures due to wrong way of passing parameters in tests * Removed 2 failures * Fix params * Remove deprecations * Removed some dep warnings * Remove deprecations * Reverted to nothing => true * Reverted to nothing => true * Avoid rendering more than once in the same action * Removed all dep warnings related to user_tags_controller_test * Remove deprecation * Removed Dep warnings * Fix deprecation * Replace before_filter * Remove deprecation * Remove deprecation * Remove deprecation * Remove deprecation * Bump Ruby version to match Travis' * Simplify email regex to work with Ruby 2.4.1 * Changed the ruby version in Dockerfile * Remove deprecation * Remove deprecation * Removed the depreciation warning related to dynamic :controller and :action segment in routes * Changed the default ActiveRecord to ApplicationRecord in models * Clean Gemfile * Reverted to ['nid'] in tag_controller_test.rb * Changed the tests to rake test:all in .travis.yml * Minor spacing correction in .travis.yml * added a commit in application.js an application.css regarding the precompilation of files * Added more indentation * Small fixes * Separated the rails test and jasmine and coveralls task * Modified ['nid'] to ['node']['nid'] * Removed the extra puts in Rakefile * Changed the serial of tests * Added rake/testtask to Rakefile * Removed puma * Changed to ruby 2.4.1-jessie * Removed the whitelist_attributes command from config/application.rb * Removed two failures due to old usage of params * Fixed some new deprecation warnigs introduced * fixes publiclab#2731 'add spam button,line 16 _answers.html.erb' (publiclab#2785) * add spam button,line 16 _answers.html.erb * changed comment.ids to answer.ids * changed from comment path to answer * changed comment.parent.path to answer.path * some more cleanup to the button * change answer.aid to answer id * First timers recaptcha Environment Variables (publiclab#2786) * Edited the if statement * Added the env variables * Edited ENV variable, and added fallback * Fixed issue#2445 added both direction sort order (publiclab#2557) * fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller * Changed get to post (publiclab#2788) * Update container definitions to match actual files used. (publiclab#2791) * Update container definitions to match actual files used. * Fix paths for running docker-compose.yml from subdir * Fix reference to Dockerfile * Reformat range stats page to table (publiclab#2792) * Index page listing for UserTags per issue publiclab#2741. (publiclab#2753) * Index page listing for UserTags per issue publiclab#2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Tests rewritten after rebase. * Index page listing for UserTags per issue publiclab#2741. * Changes per pull request checks. * Removed debugging line. * Added routes to reflect 'groups' naming convention for user_tags per pull request spec. * Fix for test of sort by value. * Update routes.rb for wiki update (publiclab#2804) * Update routes.rb * fixes * integration tests for assets (publiclab#2806) * integration tests for assets * full assets included * Update assets.rb * Added routes to notes/edit (publiclab#2808) * Added routes to notes/edit * Removed redundant notes#edit and added get instead of post in edit actions * Update routes.rb (publiclab#2810) * Create OPENID.md * fixing error in home_controller related to `group by` (publiclab#2794) * Added group by note.nid * correction * Openid fix with post route and better alert texts (publiclab#2815) * Added group by note.nid * correction * reworded openid requests and added post method for 2nd step * adjust message * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update openid_test.rb * Update Dangerfile (publiclab#2816) * Update routes.rb to fix embeddable features (publiclab#2818) * Update routes.rb * Removed the apostrophe mismatch * Added tests for embed in feature * Delete route for notes (publiclab#2820) * Documentation for the reply-by-email to comment feature (publiclab#2774) * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Added documentation for the reply-by-email to comment feature * Re-order comment options and messages (publiclab#2834) * Update _comment.html.erb * Update _comment.html.erb * encoding issue resolved for migrating DrupalUsers to User records (publiclab#2257) * encoding issue solved fixes publiclab#2209 * minor changes * Rename 20180206161706_add_user_for_orphaned_drupal_user.rb to 20180614000000_add_user_for_orphaned_drupal_user.rb * resolves issue 2520 (publiclab#2831) * Emoji autocomplete (publiclab#2832) * basic emoji autocomplete * minor changes * minor tweaks * code climate fixes * minor change * changes * remove unnecessary style * Fix parent powertags for wikis like /barnraising (publiclab#2844) * application.yml added * Views removed * Application.yml removed * application removed * Docker changes * sign up page removed

fixed issue#2445 added both direction sort order

05f4d65

shauncarland-old-account suggested changes Mar 31, 2018

View reviewed changes

shauncarland-old-account reviewed Apr 3, 2018

View reviewed changes

app/controllers/tag_controller.rb Outdated

params[:order] == "asc" ? "name ASC" : "name DESC"

end

end

Copy link

shauncarland-old-account Apr 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] extra line

shauncarland-old-account reviewed Apr 3, 2018

View reviewed changes

added function get_order_string in tags_controller

fc46cce

sukhbir-singh force-pushed the order_issue branch from 17316f9 to fc46cce Compare April 3, 2018 22:51

shauncarland-old-account reviewed Apr 4, 2018

View reviewed changes

shauncarland-old-account approved these changes Apr 4, 2018

View reviewed changes

ebarry added this to the Tagging and topics milestone Apr 17, 2018

Merge branch 'master' into order_issue

74c25d6

ghost assigned jywarren Jun 7, 2018

ghost added the in progress label Jun 7, 2018

jywarren merged commit d6a712f into publiclab:master Jun 7, 2018

ghost removed the in progress label Jun 7, 2018

SidharthBansal pushed a commit to SidharthBansal/plots2 that referenced this pull request Jun 19, 2018

Fixed issue#2445 added both direction sort order (publiclab#2557)

c795014

* fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller

SrinandanPai pushed a commit to SrinandanPai/plots2 that referenced this pull request May 5, 2019

Fixed issue#2445 added both direction sort order (publiclab#2557)

eaf78e6

* fixed issue#2445 added both direction sort order * added function get_order_string in tags_controller

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed issue#2445 added both direction sort order #2557

Fixed issue#2445 added both direction sort order #2557

sukhbir-singh commented Mar 29, 2018

PublicLabBot commented Mar 29, 2018 •

edited by plotsbot

Loading

shauncarland-old-account left a comment

shauncarland-old-account Mar 31, 2018 •

edited

Loading

shauncarland-old-account Mar 31, 2018

shauncarland-old-account Mar 31, 2018

shauncarland-old-account Mar 31, 2018

sukhbir-singh commented Apr 2, 2018

jywarren commented Apr 3, 2018

shauncarland-old-account Apr 3, 2018

shauncarland-old-account Apr 3, 2018

shauncarland-old-account Apr 3, 2018 •

edited

Loading

shauncarland-old-account Apr 3, 2018

sukhbir-singh Apr 3, 2018

shauncarland-old-account commented Apr 3, 2018

shauncarland-old-account Apr 3, 2018

sukhbir-singh Apr 3, 2018

shauncarland-old-account Apr 4, 2018

sukhbir-singh commented Apr 3, 2018

shauncarland-old-account Apr 4, 2018

sukhbir-singh Apr 4, 2018 •

edited

Loading

shauncarland-old-account left a comment

ebarry commented Apr 17, 2018

jywarren commented Jun 7, 2018

Fixed issue#2445 added both direction sort order #2557

Fixed issue#2445 added both direction sort order #2557

Conversation

sukhbir-singh commented Mar 29, 2018

PublicLabBot commented Mar 29, 2018 • edited by plotsbot Loading

shauncarland-old-account left a comment

Choose a reason for hiding this comment

shauncarland-old-account Mar 31, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sukhbir-singh commented Apr 2, 2018

jywarren commented Apr 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shauncarland-old-account Apr 3, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shauncarland-old-account commented Apr 3, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sukhbir-singh commented Apr 3, 2018

Choose a reason for hiding this comment

sukhbir-singh Apr 4, 2018 • edited Loading

Choose a reason for hiding this comment

shauncarland-old-account left a comment

Choose a reason for hiding this comment

ebarry commented Apr 17, 2018

jywarren commented Jun 7, 2018

PublicLabBot commented Mar 29, 2018 •

edited by plotsbot

Loading

shauncarland-old-account Mar 31, 2018 •

edited

Loading

shauncarland-old-account Apr 3, 2018 •

edited

Loading

sukhbir-singh Apr 4, 2018 •

edited

Loading