Fixes #7491 - moved default org and default location to same tab as org/... #1774
Conversation
|
[test] |
|
@shlomizadok, looks good, but I noticed two issues.
|
| @@ -9,6 +9,11 @@ | |||
| {:disabled => obj.used_location_ids }.merge!(select_options), | |||
| {'data-descendants' => obj.children_of_selected_location_ids.to_json, | |||
| 'data-useds' => obj.used_location_ids.to_json }.merge!(html_options[:location]) %> | |||
|
|
|||
| <% if SETTINGS[:locations_enabled] && (obj.kind_of? User) %> | |||
| <%= select_f f, :default_location_id, (obj.admin? ? Location.all : obj.locations), :id, :title, | |||
There was a problem hiding this comment.
for non admins, I am guessing this should only show the selected taxonomies, rather then the one in the db?
There was a problem hiding this comment.
It does that on the client side. When loaded it show user's taxonomy and changes on the client when selecting / unselecting a taxonomy.
| :html_options => { :location => {:onchange => 'taxonomy_added(this, "location")' }, | ||
| :organization => {:onchange => 'taxonomy_added(this, "organization")' } | ||
| } %> | ||
| :html_options => user_taxomonies_html_options(@user) |
There was a problem hiding this comment.
s/taxonomonies/taxonomies/g , same in the Javascript file.
|
@isratrade I believe the reason why it goes from multi-select to dropdown is because the number of taxonomies you have selected, and therefore available to select as default, is less than 5. @shlomizadok I'm 👌 with merging this code after fixing the typo. It might make more sense to label "default organization" as "default on login", since it's already in the organization tab it's clear it's a location. Opinions? @domcleal (you reviewed the intial version of this) maybe? |
dLobatog
added
Waiting on contributor
and removed
Not yet reviewed
Needs testing
labels
shlomizadok
force-pushed
the
7491
branch
2 times, most recently
from
d6867ec
to
fe6f8ab
Compare
|
@elobato - fixed the typo. Thanks. |
| @@ -9,6 +9,10 @@ | |||
| {:disabled => obj.used_location_ids }.merge!(select_options), | |||
| {'data-descendants' => obj.children_of_selected_location_ids.to_json, | |||
| 'data-useds' => obj.used_location_ids.to_json }.merge!(html_options[:location]) %> | |||
| <% if SETTINGS[:locations_enabled] && (obj.kind_of? User) %> | |||
| <%= select_f f, :default_location_id, (obj.admin? ? Location.all : obj.locations), :id, :title, | |||
| { :include_blank => true }, { :label => _('Default location') } %> | |||
There was a problem hiding this comment.
Can you change this label (and the one for organizations) to "Default on login"?
Since you moved this to the tabs they belong in (thanks!) "Default location" is redundant with the title of the tab, and "Default on login" makes it a bit clearer for users to understand what's this default.
…e tab as org/loc selection
|
Merged as 79f0876 , thanks @shlomizadok ! |
...loc selection