infopark_fiona7 1.2.0.2.1 → 1.2.0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 95e1d0c153cae176d4413ba9de85700117ff2119
-  data.tar.gz: 073a4693abd33326b6d2218d7d0f69eb95a6c81a
+  metadata.gz: a8031af6f4f105005e994649c92cf9fa54bbd3e2
+  data.tar.gz: 3883dca2b5d3014599ee86386644091e7b6fa7cf
 SHA512:
-  metadata.gz: e4684651e4eea73bcc38691a9ae8b0441063c190cd71b6a67637c2022eb9b2bcfb14fd306a9dda84f5d1b9dd3141f2f4594a8b373db98354b304780915cf1e8b
-  data.tar.gz: 47871bc4bdd0a6ee52369e9b07f83b89af87a0c16a483c63fd0d2ed89a11d56fa0cf8425081a58912800f7814edcfa5813b2e47508f90e3343cc02234b4f66e6
+  metadata.gz: 13ed041d1617545fafc18b486384fea941593bdf73f3834535376fe90809e67c626ef3380ebb1ce0c714b4923857745f5c39b5f14c5f8c2f18d7342ed0be361d
+  data.tar.gz: c4358b8963db06312bcd4d38942e9a69ac3eb90ed01889d47e927b65eb82d5f24f5d51a3481da5da12d3bbe35604600b2279b8a80ec79e3c61fb58af6c0e8448

data/app/controllers/fiona7/sessions_controller.rb

@@ -7,7 +7,7 @@ module Fiona7
       if valid_credentials?(login, password)
         rsession.user_name = login
 
-        redirect_to true_root_path
+        redirect_to login_redirect
       else
         flash[:error] = I18n.t(:"fiona7.invalid_credentails")
         begin
@@ -28,6 +28,10 @@ module Fiona7
       @login_page = Fiona7LoginPage.instance || Scrivito::BasicObj.root
     end
 
+    def login_redirect
+      session[:login_redirect].presence || true_root_path
+    end
+
     def true_root_path
       if Fiona7.mode == :standalone
         '/'

data/app/controllers/fiona7_login_page_controller.rb

@@ -18,6 +18,9 @@ class Fiona7LoginPageController < parent_class
   end
 
   def index
+    if request.referrer.present?
+      session[:login_redirect] ||= request.referrer
+    end
     super
   end
 

data/app/views/fiona7_login_page/index.html.erb

@@ -1,6 +1,12 @@
 <%= scrivito_tag :h1, @obj, :title %>
 <%= scrivito_tag :div, @obj, :body %>
 
+<% if flash[:error].present? %>
+  <div class="alert alert-danger" role="alert">
+    <%= flash[:error] %>
+  </div>
+<% end %>
+
 <%= form_tag fiona7_login_path, role: 'form' do %>
   <div class="form-group">
     <%= label_tag :login, t(:"fiona7.login_field") %>

data/lib/fiona7/version.rb

@@ -1,3 +1,3 @@
 module Fiona7
-  VERSION = "1.2.0.2.1"
+  VERSION = "1.2.0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: infopark_fiona7
 version: !ruby/object:Gem::Version
-  version: 1.2.0.2.1
+  version: 1.2.0.2.2
 platform: ruby
 authors:
 - Tomasz Przedmojski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails