$(".directions_form .btn-close").on("click", function (e) {
e.preventDefault();
- var route_from = endpoints[0].value;
- if (route_from) {
- OSM.router.route("/?query=" + encodeURIComponent(route_from) + OSM.formatHash(map));
- } else {
- OSM.router.route("/" + OSM.formatHash(map));
- }
+ $(".search_form input[name='query']").val(endpoints[0].value);
+ OSM.router.route("/" + OSM.formatHash(map));
});
function formatDistance(m) {
},
zoomPrecision: function(zoom) {
- return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
+ var pixels = Math.pow(2, 8 + zoom);
+ var degrees = 180;
+ return Math.ceil(Math.log10(pixels / degrees));
},
locationCookie: function(map) {
}
}
+/* Rules for block pages */
+
+#block_list .username {
+ max-width: 20em;
+}
+
/* Rules for tabs inside secondary background sections */
.bg-body-secondary .nav-tabs {
if !user_block_was_active && @user_block.active?
flash.now[:error] = t(".inactive_block_cannot_be_reactivated")
render :action => "edit"
- elsif @user_block.save
- flash[:notice] = t(".success")
- redirect_to @user_block
else
- render :action => "edit"
+ @user_block.ends_at = @user_block.ends_at_was unless user_block_was_active
+ if @user_block.save
+ flash[:notice] = t(".success")
+ redirect_to @user_block
+ else
+ render :action => "edit"
+ end
end
end
else
<tr>
<% if show_user_name %>
- <td><%= link_to block.user.display_name, block.user %></td>
+ <td><%= link_to block.user.display_name, block.user, :class => "username d-inline-block text-truncate text-wrap" %></td>
<% end %>
<% if show_creator_name %>
- <td><%= link_to block.creator.display_name, block.creator %></td>
+ <td><%= link_to block.creator.display_name, block.creator, :class => "username d-inline-block text-truncate text-wrap" %></td>
<% end %>
<td><%= h truncate(block.reason) %></td>
<td><%= h block_status(block) %></td>
<li class="nav-item">
<%= link_to t(".block", :id => @user_block.id),
user_block_path(@user_block),
- :class => ["nav-link", { :active => action_name == "show" }] %>
+ :class => "nav-link active" %>
</li>
<% end %>
</ul>
<% @title = t ".title", :name => @user_block.user.display_name %>
+
+<% content_for :heading_class, "pb-0" %>
<% content_for :heading do %>
<h1><%= t(".heading_html", :name => link_to(@user_block.user.display_name, @user_block.user)) %></h1>
- <nav class='secondary-actions'>
- <ul class='clearfix'>
- <li><%= link_to t(".show"), @user_block %></li>
- <li><%= link_to t(".back"), user_blocks_path %></li>
- </ul>
- </nav>
+ <%= render :partial => "navigation" %>
<% end %>
<%= bootstrap_form_for(@user_block) do |f| %>
<%= f.richtext_field :reason, :cols => 80, :rows => 20, :format => @user_block.reason_format %>
- <%= f.form_group do %>
- <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
- <%= select_tag("user_block_period",
- options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] },
- UserBlock::PERIODS.min_by { |h| (params[:user_block_period].to_i - h).abs }),
- :class => "form-select") %>
- <% end %>
+ <% if @user_block.active? %>
+ <%= f.form_group do %>
+ <%= label_tag "user_block_period", t(".period"), :class => "form-label" %>
+ <%= select_tag "user_block_period",
+ options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] },
+ UserBlock::PERIODS.min_by { |h| (params[:user_block_period].to_i - h).abs }),
+ :class => "form-select" %>
+ <% end %>
+
+ <%= f.form_group :needs_view do %>
+ <%= f.check_box :needs_view %>
+ <% end %>
+ <% else %>
+ <div class="alert alert-info">
+ <%= t "user_blocks.update.inactive_block_cannot_be_reactivated" %>
+ </div>
- <%= f.form_group :needs_view do %>
- <%= f.check_box :needs_view %>
+ <%= hidden_field_tag "user_block_period", 0 %>
+ <%= f.hidden_field :needs_view %>
<% end %>
<%= f.primary %>
title: "Editing block on %{name}"
heading_html: "Editing block on %{name}"
period: "How long, starting now, the user will be blocked from the API for."
- show: "View this block"
- back: "View all blocks"
filter:
block_period: "The blocking period must be one of the values selectable in the drop-down list."
create:
get "/user/:display_name/diary" => "diary_entries#index"
get "/diary/:language" => "diary_entries#index"
scope "/user/:display_name" do
- resources :diary_entries, :path => "diary", :only => [:edit, :update, :show], :id => /\d+/
+ resources :diary_entries, :path => "diary", :only => [:edit, :update, :show], :id => /\d+/ do
+ member do
+ post :hide, :unhide
+ end
+ end
end
- post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry
- post "/user/:display_name/diary/:id/unhide" => "diary_entries#unhide", :id => /\d+/, :as => :unhide_diary_entry
match "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :via => [:get, :post], :as => :diary_entry_subscribe, :id => /\d+/
match "/user/:display_name/diary/:id/unsubscribe" => "diary_entries#unsubscribe", :via => [:get, :post], :as => :diary_entry_unsubscribe, :id => /\d+/
post "/user/:display_name/diary/:id/comments" => "diary_comments#create", :id => /\d+/, :as => :comment_diary_entry
get "/user/:display_name/blocks" => "user_blocks#blocks_on", :as => "user_blocks_on"
get "/user/:display_name/blocks_by" => "user_blocks#blocks_by", :as => "user_blocks_by"
get "/blocks/new/:display_name" => "user_blocks#new", :as => "new_user_block"
- resources :user_blocks
+ resources :user_blocks, :except => :new
match "/blocks/:id/revoke" => "user_blocks#revoke", :via => [:get, :post], :as => "revoke_user_block"
match "/user/:display_name/blocks/revoke_all" => "user_blocks#revoke_all", :via => [:get, :post], :as => "revoke_all_user_blocks"
{ :path => "/user_blocks", :method => :get },
{ :controller => "user_blocks", :action => "index" }
)
- assert_routing(
- { :path => "/user_blocks/new", :method => :get },
- { :controller => "user_blocks", :action => "new" }
- )
assert_routing(
{ :path => "/user_blocks", :method => :post },
{ :controller => "user_blocks", :action => "create" }
end
def check_inactive_block_updates(block)
+ original_ends_at = block.ends_at
+
put user_block_path(block,
:user_block_period => "0",
:user_block => { :needs_view => false, :reason => "Updated Reason" })
block.reload
assert_not_predicate block, :active?
assert_equal "Updated Reason", block.reason
+ assert_equal original_ends_at, block.ends_at
put user_block_path(block,
:user_block_period => "0",
block.reload
assert_not_predicate block, :active?
assert_equal "Updated Reason", block.reason
+ assert_equal original_ends_at, block.ends_at
put user_block_path(block,
:user_block_period => "1",
block.reload
assert_not_predicate block, :active?
assert_equal "Updated Reason", block.reason
+ assert_equal original_ends_at, block.ends_at
put user_block_path(block,
:user_block_period => "0",
block.reload
assert_not_predicate block, :active?
assert_equal "Updated Reason Again", block.reason
+ assert_equal original_ends_at, block.ends_at
end
def check_user_blocks_table(user_blocks)
assert_unchecked_field "Are you sure you wish to revoke 2 active blocks?"
assert_button "Revoke!"
end
+
+ test "duration controls are present for active blocks" do
+ creator_user = create(:moderator_user)
+ block = create(:user_block, :creator => creator_user, :reason => "Testing editing active blocks", :ends_at => Time.now.utc + 2.days)
+ sign_in_as(creator_user)
+
+ visit edit_user_block_path(block)
+ assert_field "Reason", :with => "Testing editing active blocks"
+ assert_select "user_block_period", :selected => "2 days"
+ assert_unchecked_field "Needs view"
+
+ fill_in "Reason", :with => "Editing active blocks works"
+ click_on "Update block"
+ assert_text(/Reason for block:\s+Editing active blocks works/)
+ end
+
+ test "duration controls are removed for inactive blocks" do
+ creator_user = create(:moderator_user)
+ block = create(:user_block, :expired, :creator => creator_user, :reason => "Testing editing expired blocks")
+ sign_in_as(creator_user)
+
+ visit edit_user_block_path(block)
+ assert_field "Reason", :with => "Testing editing expired blocks"
+ assert_no_select "user_block_period"
+ assert_no_field "Needs view"
+
+ fill_in "Reason", :with => "Editing expired blocks works"
+ click_on "Update block"
+ assert_text(/Reason for block:\s+Editing expired blocks works/)
+ end
end
projects / rails.git / commitdiff