egov_utils 0.1.35 → 0.1.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c4dbda3371757f34c4093f2e58f05ba21c6750c567d27962577f6002aa894b6
-  data.tar.gz: a43a27f761857247f2b001225dc2a8222a47e317d870fef7ace360ec0e3b682f
+  metadata.gz: 12177424f9e5b32b50bc77598353a6615cdcf2cc743b336b01e3c6c2d3dcd220
+  data.tar.gz: 47fbc3010fb1a9366236e4a857aff8f557d6cfee1ea7c8b1eb85ddf07c4222c9
 SHA512:
-  metadata.gz: 68e8a489421ebaca129737565cc70f0c0f2a5c4a03bbc8a6b62c623f1ad425acf2e553127aaf03e90f81a320a055ce6499b71936d7207fa3a213108f19643f0a
-  data.tar.gz: 57b1603c7b2f9e99a91deb4da0faa5f9d10c5e3a84d05b473221488d5267884530251dcf526b4d9cbca9a0c446a717856c6d12b8f5a357be3e961c119993aeec
+  metadata.gz: 644a5bfbf7f770bd60fd33c0d28a4a5b90c7fb79e40c343d2191aca3670d6bfe5408ba15cb80e0a2096b44a1e765b3f623d5b5d9b00434203d2228a9c9a53925
+  data.tar.gz: 356721469b453f6c011e324bf5084171b42a9b418b19256a3fde5f339c1cf780e03f14fd4686ef9057c71ea4442820535d8d0a070e05f9aada2e3e6350c91cd2

data/app/assets/stylesheets/egov_utils/egov_utils.scss

@@ -4,3 +4,7 @@
 @import 'egov_utils/select2-bootstrap';
 
 @import "cookies_eu";
+
+.button_to {
+  display: inline-block;
+}

data/app/controllers/egov_utils/groups_controller.rb

@@ -5,6 +5,10 @@ module EgovUtils
 
     load_and_authorize_resource
 
+    def index
+      @groups = EgovUtils::Group.accessible_by(current_ability)
+    end
+
     def create
       respond_to do |format|
         if @group.save

data/app/controllers/egov_utils/users_controller.rb

@@ -6,10 +6,13 @@ module EgovUtils
 
     skip_before_action :require_login, only: [:new, :create, :confirm]
 
-    load_and_authorize_resource only: :index
+    authorize_resource only: :index
+    load_and_authorize_resource only: :destroy
 
     def index
       providers
+      @users = EgovUtils::User.accessible_by(current_ability).order(:provider)
+      @groups = EgovUtils::Group.accessible_by(current_ability).order(:provider)
     end
 
     def new
@@ -39,6 +42,11 @@ module EgovUtils
     def show
     end
 
+    def destroy
+      @user.destroy
+      redirect_to users_path, notice: t('activerecord.successful.messages.destroyed', model: User.model_name.human)
+    end
+
     def approve
       @user = User.find_by(id: params[:id])
       render_404 and return unless @user || @user.active?

data/app/views/egov_utils/groups/_groups_tab.html.haml

@@ -0,0 +1,20 @@
+%table#groups.table
+  %thead
+    %tr
+      %th= EgovUtils::Group.human_attribute_name('name')
+      %th= EgovUtils::Group.human_attribute_name('provider')
+      %th= EgovUtils::Group.human_attribute_name('roles')
+  %tbody
+    - groups.each do |group|
+      %tr
+        %td= group.name
+        %td= group.provider
+        - if can?(:manage, group)
+          %td.roles{data: {roles: group.roles, id: group.id}}= group.roles.join(', ')
+        - else
+          %td
+
+:javascript
+  $(function(){
+    $('#groups tbody').roles({ url: '#{roles_path(entity_class: 'EgovUtils::Group')}' });
+  });

data/app/views/egov_utils/groups/index.html.haml

@@ -0,0 +1,21 @@
+%ul.nav.nav-tabs{role: 'tablist'}
+  %li.nav-item
+    = link_to(EgovUtils::User.model_name.human(count: :other), users_path, id: 'users_tab', class: 'nav-link', 'data-toggle'=>'tab', 'aria-controls'=>'users_container')
+  %li.nav-item
+    = link_to(EgovUtils::Group.model_name.human(count: :other), groups_path, id: 'groups_tab', class: 'nav-link active', 'data-toggle'=>'tab', 'aria-controls'=>'groups_container')
+
+.tab-content
+  #users_container.tab-pane.fade{role: 'tabpanel', 'aria-labelledby'=>'users_tab'}
+    = render 'egov_utils/users/users_tab', users: @users
+  #groups_container.tab-pane.fade.show.active{role: 'tabpanel', 'aria-labelledby'=>'groups_tab'}
+    = render 'egov_utils/groups/groups_tab', groups: @groups
+  #create_container.tab-pane.fade{role: 'tabpanel', 'aria-labelledby'=>'create_tab'}
+    %h3= t('label_ldap')
+    = render 'egov_utils/users/ldap_search'
+    %h3= t('label_new')
+    = bootstrap_form_for(EgovUtils::User.new) do |f|
+      = render 'egov_utils/users/form', form: f
+
+$.ajax('url').done(function(response){
+  $('#cast-2-rizeni-pred-soudem-prvniho-stupne').html(response);
+});

data/app/views/egov_utils/users/_ldap_search.html.haml

@@ -0,0 +1,51 @@
+= bootstrap_form_for(:search, url: search_users_path(format: :json), html: {id: 'user_search_form'}) do |f|
+  = f.text_field(:q, id: 'search_q', label: {text: t('label_search'), class: 'sr-only'}, placeholder: t('label_search'))
+  = f.submit t('label_search')
+
+%table.table#users_results
+  %thead
+    %tr
+      %th= EgovUtils::User.human_attribute_name('login')
+      %th= EgovUtils::User.human_attribute_name('fullname')
+      %th= t(:label_actions)
+  %tbody
+%table.table#groups_results
+  %thead
+    %tr
+      %th= EgovUtils::Group.human_attribute_name('name')
+      %th= t(:label_actions)
+  %tbody
+
+:javascript
+  $('#user_search_form').on('submit', function(evt) {
+    evt.preventDefault();
+    $form = $(this);
+    $.ajax(this.action, {method: 'GET', data: {q: $('#search_q').val()}}).done(function(data, status, xhr){
+      $.each(['users', 'groups'], function(i, type) {
+        var tbl = $('#'+type+'_results tbody');
+        tbl.html('');
+        $.each(data[type], function(i, entity_data) {
+          var str, data_key, path, req_data;
+          if( type == 'users' ) {
+            str = '<td title="'+entity_data.dn.replace(/"/g, "&quot;")+'">'+entity_data.login+'</td><td>'+entity_data.firstname + ' ' + entity_data.lastname +'</td>';
+            req_data = {user: entity_data};
+            path = '#{users_path(format: :json)}';
+          } else {
+            str = '<td title="'+entity_data.dn.replace(/"/g, "&quot;")+'">'+entity_data.name+'</td>';
+            req_data = {group: entity_data};
+            path = '#{groups_path(format: :json)}';
+          }
+
+          $('<tr>' + str + '<td><button class="btn btn-primary add-button">Add</button></td></tr>').
+            appendTo(tbl).on('click', '.add-button', function(evt){
+              evt.preventDefault();
+              $(this).prop('disabled', true);
+              $.ajax(path, {method: 'POST', data: req_data}).done(function(addData, textStatus){
+                window.location.reload();
+              });
+            });
+        });
+      });
+      $form.find('input[type="submit"]').prop('disabled', false);
+    });
+  });

data/app/views/egov_utils/users/_users_tab.html.haml

@@ -0,0 +1,25 @@
+%table.table#users
+  %thead
+    %tr
+      %th= t('model_attributes.user.fullname')
+      %th= EgovUtils::User.human_attribute_name('roles')
+      %th= EgovUtils::User.human_attribute_name('provider')
+      %th= t('label_actions')
+  %tbody
+    - users.each do |user|
+      %tr
+        %td= user.fullname
+        %td= user.provider
+        - if can?(:manage, user)
+          %td.roles{data: {roles: user.roles, id: user.id}}= user.roles.join(', ')
+        - else
+          %td
+        %td
+          = button_to(t('label_delete'), user_path(user), method: :delete, class: 'btn btn-warning btn-sm')
+          - unless user.active?
+            = button_to(t('label_approve'), approve_user_path(user), class: 'btn btn-primary btn-sm')
+
+:javascript
+  $(function(){
+    $('#users tbody').roles({ url: '#{roles_path(entity_class: 'EgovUtils::User')}' });
+  });

data/app/views/egov_utils/users/index.html.haml

@@ -1,62 +1,26 @@
-= bootstrap_form_for(:search, url: search_users_path(format: :json), html: {id: 'user_search_form'}) do |f|
-  = f.text_field(:q, id: 'search_q')
-  = f.submit
+%ul.nav.nav-tabs{role: 'tablist'}
+  %li.nav-item
+    = link_to(EgovUtils::User.model_name.human(count: :other), '#users_container', id: 'users_tab', class: 'nav-link active', 'data-toggle'=>'tab', 'aria-controls'=>'users_container')
+  %li.nav-item
+    = link_to(EgovUtils::Group.model_name.human(count: :other), '#groups_container', id: 'groups_tab', class: 'nav-link', 'data-toggle'=>'tab', 'aria-controls'=>'groups_container')
+  %li.nav-item.dropdown
+    %a.nav-link.dropdown-toggle{'data-toggle'=>'dropdown', 'href'=>'#', 'role'=>'button'}
+      = t('label_new')
+    .dropdown-menu
+      = link_to(t('label_new'), '#create', id: 'create_tab', class: 'dropdown-item', 'data-toggle'=>'tab', 'aria-controls'=>'create')
+      = link_to(t('label_ldap'), '#create_ldap', id: 'create_tab', class: 'dropdown-item', 'data-toggle'=>'tab', 'aria-controls'=>'create_ldap')
 
-%table.table#users_results
-  %thead
-    %tr
-      %th= EgovUtils::User.human_attribute_name('login')
-      %th= EgovUtils::User.human_attribute_name('fullname')
-      %th= t(:label_actions)
-  %tbody
-%table.table#groups_results
-  %thead
-    %tr
-      %th= EgovUtils::Group.human_attribute_name('name')
-      %th= t(:label_actions)
-  %tbody
-
-%h5= EgovUtils::User.model_name.human(count: :other)
-%table.table#users
-  %thead
-    %tr
-      %th= t('model_attributes.user.fullname')
-      %th Akce
-  %tbody
-    - EgovUtils::User.all.each do |user|
-      %tr
-        %td= user.fullname
-        %td
-          - unless user.active?
-            = button_to(t('label_approve'), approve_user_path(user), class: 'btn btn-primary btn-sm')
-
-:javascript
-  $('#user_search_form').on('submit', function(evt) {
-    evt.preventDefault();
-    $form = $(this);
-    $.ajax(this.action, {method: 'GET', data: {q: $('#search_q').val()}}).done(function(data, status, xhr){
-      $.each(['users', 'groups'], function(i, type) {
-        var tbl = $('#'+type+'_results tbody');
-        tbl.html('');
-        $.each(data[type], function(i, entity_data) {
-          var str, data_key, path, req_data;
-          if( type == 'users' ) {
-            str = '<td title="'+entity_data.dn.replace(/"/g, "&quot;")+'">'+entity_data.login+'</td><td>'+entity_data.firstname + ' ' + entity_data.lastname +'</td>';
-            req_data = {user: entity_data};
-            path = '#{users_path(format: :json)}';
-          } else {
-            str = '<td title="'+entity_data.dn.replace(/"/g, "&quot;")+'">'+entity_data.name+'</td>';
-            req_data = {group: entity_data};
-            path = '#{groups_path(format: :json)}';
-          }
-
-          $('<tr>' + str + '<td><button class="btn btn-primary add-button">Add</button></td></tr>').
-            appendTo(tbl).on('click', '.add-button', function(evt){
-              evt.preventDefault();
-              $.ajax(path, {method: 'POST', data: req_data});
-            });
-        });
-      });
-      $form.find('input[type="submit"]').prop('disabled', false);
-    });
-  });
+.tab-content
+  #users_container.tab-pane.fade.show.active{role: 'tabpanel', 'aria-labelledby'=>'users_tab'}
+    = render 'egov_utils/users/users_tab', users: @users
+  #groups_container.tab-pane.fade{role: 'tabpanel', 'aria-labelledby'=>'groups_tab'}
+    = render 'egov_utils/groups/groups_tab', groups: @groups
+  #create_ldap.tab-pane.fade{role: 'tabpanel', 'aria-labelledby'=>'create_tab'}
+    %h3= t('label_ldap')
+    = render 'egov_utils/users/ldap_search'
+  #create.tab-pane.fade{role: 'tabpanel', 'aria-labelledby'=>'create_tab'}
+    %h3= t('label_new')
+    = bootstrap_form_for(EgovUtils::User.new) do |f|
+      = render 'egov_utils/users/form', form: f
+      .form-actions
+        = f.submit

data/config/locales/cs.yml

@@ -21,7 +21,7 @@ cs:
   notice_account_pending: Váš účet čeká na schválení/ověření
   notice_account_locked: Váš účet byl uzamčen správcem aplikace
   notice_logout: Byl/a jste úspěšně odhlášen/a
-  notice_signeup_with_mail: Registrace proběhla úspěšně, byl Vám odeslán potvrovací e-mail, prosím zkontrolujte svou poštu.
+  notice_signeup_with_mail: Registrace proběhla úspěšně, byl Vám odeslán potvrzovací e-mail, prosím zkontrolujte svou poštu.
   success_user_confirm: Váše e-mailová adresa byla potvrzena. Nyní se již můžete přihlásit.
 
   label_approve: Schválit
@@ -33,6 +33,10 @@ cs:
   label_signup: Registrovat
   label_validate_address: Zvalidovat
   label_save: Uložit
+  label_ldap: LDAP
+  label_search: Vyhledat
+  label_delete: Smazat
+  label_actions: Akce
 
   text_born_on_at: "Narozen %{date} v %{place}"
 
@@ -60,6 +64,9 @@ cs:
       firstname: Jméno
       lastname: Příjmení
       fullname: Jméno a příjmení
+      roles: Role
+    egov_utils/group:
+      roles: Role
     egov_utils/address:
       full_address: Adresa
       street: Ulice
@@ -109,6 +116,7 @@ cs:
       messages:
         created: "%{model} úspěšně vytvořen"
         updated: "%{model} úspěšně aktualizován"
+        destroyed: "%{model} úspěšně smazán"
 
   helpers:
     label:

data/lib/egov_utils/version.rb

@@ -1,3 +1,3 @@
 module EgovUtils
-  VERSION = '0.1.35'
+  VERSION = '0.1.36'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egov_utils
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.36
 platform: ruby
 authors:
 - Ondřej Ezr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -400,12 +400,16 @@ files:
 - app/views/common/_grid.html.coffee
 - app/views/common/_modal.html.haml
 - app/views/egov_utils/addresses/_form.html.haml
+- app/views/egov_utils/groups/_groups_tab.html.haml
+- app/views/egov_utils/groups/index.html.haml
 - app/views/egov_utils/people/_form.html.haml
 - app/views/egov_utils/roles/index.html.haml
 - app/views/egov_utils/sessions/new.html.haml
 - app/views/egov_utils/user_mailer/confirmation_email.html.erb
 - app/views/egov_utils/user_mailer/confirmation_email.text.erb
 - app/views/egov_utils/users/_form.html.haml
+- app/views/egov_utils/users/_ldap_search.html.haml
+- app/views/egov_utils/users/_users_tab.html.haml
 - app/views/egov_utils/users/index.html.haml
 - app/views/egov_utils/users/new.html.haml
 - app/views/egov_utils/users/show.html.haml
@@ -574,7 +578,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: The eGoverment utilities is set of functionalities to support basic eGoverment