<%= f.error_notification %>
+ <%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb
index 5c930e660..99107a71c 100644
--- a/app/views/layouts/shared/_header.html.erb
+++ b/app/views/layouts/shared/_header.html.erb
@@ -24,8 +24,14 @@
<%= link_to :settings, class: 'dropdown-item' do %>
<%= fa_icon('shield', text: t('.account_settings')) %>
<% end %>
- <%= link_to :logout, class: 'dropdown-item', method: :delete do %>
- <%= fa_icon('lock', text: t('.logout')) %>
+ <% if ENV.fetch('NOKUL_SSO_ENABLE', false) %>
+ <%= link_to "#{Tenant.credentials.lemonldap[:issuer]}/oauth2/logout", class: 'dropdown-item' do %>
+ <%= fa_icon('lock', text: t('.logout')) %>
+ <% end %>
+ <% else %>
+ <%= link_to :logout, class: 'dropdown-item', method: :delete do %>
+ <%= fa_icon('lock', text: t('.logout')) %>
+ <% end %>
<% end %>
diff --git a/app/views/patron/components/_role_permissions.html.erb b/app/views/patron/components/_role_permissions.html.erb
new file mode 100644
index 000000000..295323409
--- /dev/null
+++ b/app/views/patron/components/_role_permissions.html.erb
@@ -0,0 +1,36 @@
+
+
+
+
+ | <%= t('name', scope: %i[activerecord attributes patron/permission]) %> |
+ <%= t('identifier', scope: %i[activerecord attributes patron/permission]) %> |
+ <% Patron::PermissionBuilder.supported_privileges.each do |privilege| %>
+ <%= t(privilege, scope: %i[active_flag patron/role_permission privileges]) %> |
+ <% end %>
+ <% if actions_visible %>
+ <%= t('actions') %> |
+ <% end %>
+
+
+
+ <% permissions.each do |permission| %>
+
+ | <%= link_to(permission.name, permission.permission) %> |
+ <%= permission.identifier %> |
+ <% Patron::PermissionBuilder.supported_privileges.each do |privilege| %>
+
+ <% if RoleManagement.privilege?(permission.identifier.to_sym, privilege) %>
+ <%= icon_for_check(permission.privileges.public_send("#{privilege}?")) %>
+ <% else %>
+ -
+ <% end %>
+ |
+ <% end %>
+ <% if actions_visible %>
+ <%= link_to_show(permission) %> |
+ <% end %>
+
+ <% end %>
+
+
+
diff --git a/app/views/patron/roles/_form.html.erb b/app/views/patron/roles/_form.html.erb
index 19aaf13cf..5cedc88b8 100644
--- a/app/views/patron/roles/_form.html.erb
+++ b/app/views/patron/roles/_form.html.erb
@@ -13,23 +13,37 @@
<%= simple_form_for(@role) do |f| %>
<%= f.error_notification %>
-
- <%= f.input :name, required: true %>
-
+
+
+ <%= f.input :name, required: true %>
+
-
- <%= f.input :identifier, required: true %>
-
+
+ <%= f.input :identifier, required: true %>
+
-
- <%= f.association :permissions, required: true %>
-
+
+
+
<%= t('.permissions') %>
+
+
-
- <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+ <%= f.simple_fields_for :role_permissions do |role_permission| %>
+ <%= render 'role_permission_fields', f: role_permission %>
+ <% end %>
+
+
+ <%= link_to_add_association f, :role_permissions, class: 'btn btn-primary btn-sm pull-right' %>
+
+
+
+ <%= f.button :submit, class: 'btn btn-outline-success btn-sm' %>
+
<% end %>
+
+<%= javascript_include_tag 'shared/cocoon' %>
diff --git a/app/views/patron/roles/_role_permission_fields.html.erb b/app/views/patron/roles/_role_permission_fields.html.erb
new file mode 100644
index 000000000..e3800b8c2
--- /dev/null
+++ b/app/views/patron/roles/_role_permission_fields.html.erb
@@ -0,0 +1,29 @@
+
- <%= render 'patron/components/permissions',
+ <%= render 'patron/components/role_permissions',
permissions: @permissions,
actions_visible: false %>
diff --git a/app/views/studentship/course_enrollments/_student_info.html.erb b/app/views/studentship/course_enrollments/_student_info.html.erb
index 818419fa5..09fc2406c 100644
--- a/app/views/studentship/course_enrollments/_student_info.html.erb
+++ b/app/views/studentship/course_enrollments/_student_info.html.erb
@@ -25,8 +25,8 @@
- <% if @service.enrollment_status != :saved %>
- <% url = new_student_course_enrollment_url(@student) %>
- <% else %>
+ <% if @student.current_registration.saved? %>
<% url = list_student_course_enrollments_url(@student) %>
+ <% else %>
+ <% url = new_student_course_enrollment_url(@student) %>
<% end %>
<%= link_to url, class: 'list-group-item list-group-item-action align-items-center' do %>
@@ -21,7 +21,7 @@
<%= @student.unit.name %>
<%= @student.registation_date_range %>
-
<%= "#{t('.enrollment_status')}: #{t('activerecord.enums.course_enrollment.statuses')[@service.enrollment_status]}" if @service.enrollment_status.presence %>
+
<%= "#{t('.registration_status')}: #{enum_t(@student.current_registration, :status)}" %>
<% end %>
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 722dbc3a5..869761468 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -3,7 +3,7 @@
Rails.application.configure do
# Settings specified here will take precedence over those in config/application.rb.
- %w[.ngrok.io .serveo.net .localtunnel.me].each { |host| config.hosts << host }
+ %w[.ngrok.io .serveo.net .localtunnel.me .vagrant.ga].each { |host| config.hosts << host }
# In the development environment your application's code is reloaded on
# every request. This slows down response time but is perfect for development
@@ -65,4 +65,7 @@
# Use an evented file watcher to asynchronously detect changes in source code,
# routes, locales, etc. This feature depends on the listen gem.
config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+ # Web console permissions
+ config.web_console.permissions = '10.0.3.0/16'
end
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index 93f6ac9e0..53afb1cfc 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -170,7 +170,14 @@
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again. Default is 30 minutes.
- config.timeout_in = 45.minutes
+ config.timeout_in =
+ if Nokul::SSO.enabled?
+ 5.minutes
+ elsif Rails.env.development?
+ 120.minutes
+ else
+ 45.minutes
+ end
# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.
@@ -277,4 +284,12 @@
# When using OmniAuth, Devise cannot automatically set OmniAuth path,
# so you need to do it manually. For the users scope, it would be:
# config.omniauth_path_prefix = '/my_engine/users/auth'
+
+ config.omniauth :openid_connect,
+ name: :openid_connect,
+ scope: %i[openid email],
+ response_type: :code,
+ issuer: Tenant.credentials.lemonldap[:issuer],
+ discovery: true,
+ client_options: Tenant.credentials.lemonldap[:client_options]
end
diff --git a/config/initializers/role_management.rb b/config/initializers/role_management.rb
index 9a09a0cad..f6b0522c3 100644
--- a/config/initializers/role_management.rb
+++ b/config/initializers/role_management.rb
@@ -7,21 +7,28 @@ class RoleManagement
# permissions
permission :role_management,
name: 'Rol Yönetimi',
- description: 'Rol Yönetim Yetkisi'
+ description: 'Rol Yönetim Yetkisi',
+ privileges: %i[read write destroy]
permission :permission_management,
name: 'İzin Yönetimi',
- description: 'İzin Yönetim Yetkisi'
+ description: 'İzin Yönetim Yetkisi',
+ privileges: %i[read write destroy]
permission :scope_query_management,
name: 'Kapsam Sorgu Yönetimi',
- description: 'Kapsam Sorgu Yönetim Yetkisi'
+ description: 'Kapsam Sorgu Yönetim Yetkisi',
+ privileges: %i[read write destroy]
permission :authorization_management,
name: 'Yetkilendirme Yönetimi',
- description: 'Yetkilendirme Yönetimi Yetkisi'
+ description: 'Yetkilendirme Yönetimi Yetkisi',
+ privileges: %i[read write destroy]
# roles
role :authorization_manager,
name: 'Yetkilendirme Yöneticisi',
- permissions: %i[
- role_management permission_management scope_query_management authorization_management
- ]
+ permissions: {
+ role_management: %i[read write destroy],
+ permission_management: %i[read write destroy],
+ scope_query_management: %i[read write destroy],
+ authorization_management: %i[read write destroy]
+ }
end
diff --git a/config/initializers/ssl.rb b/config/initializers/ssl.rb
new file mode 100644
index 000000000..074fc639c
--- /dev/null
+++ b/config/initializers/ssl.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+if Rails.env.development?
+ OpenIDConnect.http_config do |config|
+ config.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
+ end
+end
diff --git a/config/initializers/zeitwerk.rb b/config/initializers/zeitwerk.rb
index 955ff84a2..b1878ade6 100644
--- a/config/initializers/zeitwerk.rb
+++ b/config/initializers/zeitwerk.rb
@@ -2,6 +2,7 @@
Rails.autoloaders.each do |autoloader|
autoloader.inflector.inflect(
- 'ldap' => 'LDAP'
+ 'ldap' => 'LDAP',
+ 'sso' => 'SSO'
)
end
diff --git a/config/locales/controllers/course_management/available_courses.en.yml b/config/locales/controllers/course_management/available_courses.en.yml
index 2c8f903fc..e6eb4b894 100644
--- a/config/locales/controllers/course_management/available_courses.en.yml
+++ b/config/locales/controllers/course_management/available_courses.en.yml
@@ -8,6 +8,13 @@ en:
curriculum: Curriculum
groups: Groups
unit: Unit
+ available_course/groups:
+ name: Group Name
+ quota: Quota
+ lecturers: Lecturers
+ available_course/groups/lecturers:
+ lecturer: Lecturer
+ coordinator: Coordinator
cocoon:
groups:
add: Add Group
diff --git a/config/locales/controllers/course_management/available_courses.tr.yml b/config/locales/controllers/course_management/available_courses.tr.yml
index 85ab509f0..939d32436 100644
--- a/config/locales/controllers/course_management/available_courses.tr.yml
+++ b/config/locales/controllers/course_management/available_courses.tr.yml
@@ -8,6 +8,13 @@ tr:
curriculum: Müfredat
groups: Gruplar
unit: Birim
+ available_course/groups:
+ name: Grup Adı
+ quota: Kontenjan
+ lecturers: Öğretim elemanları
+ available_course/groups/lecturers:
+ lecturer: Öğretim Elemanı
+ coordinator: Koordinatör
cocoon:
groups:
add: Grup Ekle
diff --git a/config/locales/controllers/meksis/buildings.en.yml b/config/locales/controllers/meksis/buildings.en.yml
index 3b2aa6d01..8f24dab2c 100644
--- a/config/locales/controllers/meksis/buildings.en.yml
+++ b/config/locales/controllers/meksis/buildings.en.yml
@@ -49,3 +49,5 @@ en:
chart_of_available_spaces: Numeric Distribution of Available Spaces by Classroom
chart_of_classrooms: Numeric Distribution of Classrooms by Place Type
chart_of_place_numbers: Numeric Distribution of Place Numbers by Place Type
+ update:
+ success: Building successfully updated.
diff --git a/config/locales/controllers/meksis/buildings.tr.yml b/config/locales/controllers/meksis/buildings.tr.yml
index 0b123f6b7..7a36fd6a5 100644
--- a/config/locales/controllers/meksis/buildings.tr.yml
+++ b/config/locales/controllers/meksis/buildings.tr.yml
@@ -49,3 +49,5 @@ tr:
chart_of_available_spaces: Sınıf Tiplerine Göre Mevcut Alan Miktarı
chart_of_classrooms: Mekan Türüne Göre Sınıflar
chart_of_place_numbers: Türüne Göre Mekan Sayıları
+ update:
+ success: Bina başarıyla güncellenmiştir.
diff --git a/config/locales/controllers/patron/permissions.en.yml b/config/locales/controllers/patron/permissions.en.yml
index 365af9cba..9bc4fe866 100644
--- a/config/locales/controllers/patron/permissions.en.yml
+++ b/config/locales/controllers/patron/permissions.en.yml
@@ -5,6 +5,10 @@ en:
identifier: Permission Identifier
name: Permission Name
description: Permission Description
+ patron/role_permission:
+ permission: İzin
+ privileges: Ayrıcalıkları
+
patron:
permissions:
index:
@@ -15,4 +19,10 @@ en:
roles: Roles
smart_search_placeholder: Search with Model-Specific Keyword
users: Users
-
+ active_flag:
+ patron/role_permission:
+ privileges:
+ read: Read
+ write: Write
+ destroy: Destroy
+ report: Report
diff --git a/config/locales/controllers/patron/permissions.tr.yml b/config/locales/controllers/patron/permissions.tr.yml
index edee8433c..e42c84199 100644
--- a/config/locales/controllers/patron/permissions.tr.yml
+++ b/config/locales/controllers/patron/permissions.tr.yml
@@ -5,6 +5,10 @@ tr:
identifier: İzin Tanımlayıcı
name: İzin Adı
description: İzin Açıklaması
+ privileges: Ayrıcalıkları
+ patron/role_permission:
+ permission: İzin
+ privileges: Ayrıcalıkları
patron:
permissions:
index:
@@ -15,4 +19,10 @@ tr:
roles: Roller
smart_search_placeholder: Modele Özel Anahtar Kelime ile Arama
users: Kullanıcılar
-
+ active_flag:
+ patron/role_permission:
+ privileges:
+ read: Okuma
+ write: Yazma
+ destroy: Silme
+ report: Raporlama
diff --git a/config/locales/controllers/patron/role_permissions.en.yml b/config/locales/controllers/patron/role_permissions.en.yml
new file mode 100644
index 000000000..de8569c44
--- /dev/null
+++ b/config/locales/controllers/patron/role_permissions.en.yml
@@ -0,0 +1,13 @@
+en:
+ activerecord:
+ attributes:
+ patron/role_permission:
+ permission: Permission
+ privileges: Privileges
+ active_flag:
+ patron/role_permission:
+ privileges:
+ read: Read
+ write: Write
+ destroy: Destroy
+ report: Report
diff --git a/config/locales/controllers/patron/role_permissions.tr.yml b/config/locales/controllers/patron/role_permissions.tr.yml
new file mode 100644
index 000000000..cb038efea
--- /dev/null
+++ b/config/locales/controllers/patron/role_permissions.tr.yml
@@ -0,0 +1,13 @@
+tr:
+ activerecord:
+ attributes:
+ patron/role_permission:
+ permission: İzin
+ privileges: Ayrıcalıkları
+ active_flag:
+ patron/role_permission:
+ privileges:
+ read: Okuma
+ write: Yazma
+ destroy: Silme
+ report: Raporlama
diff --git a/config/locales/controllers/patron/roles.en.yml b/config/locales/controllers/patron/roles.en.yml
index 44d357681..8fc3519eb 100644
--- a/config/locales/controllers/patron/roles.en.yml
+++ b/config/locales/controllers/patron/roles.en.yml
@@ -20,6 +20,8 @@ en:
success: Role successfully deleted!
edit:
form_title: Update the Role
+ form:
+ permissions: Permissions
index:
card_header: Roles
new_role_link: Add a New Role
diff --git a/config/locales/controllers/patron/roles.tr.yml b/config/locales/controllers/patron/roles.tr.yml
index c509af3be..d83e1c717 100644
--- a/config/locales/controllers/patron/roles.tr.yml
+++ b/config/locales/controllers/patron/roles.tr.yml
@@ -20,6 +20,8 @@ tr:
success: Rol başarıyla silindi.
edit:
form_title: Rolü Güncelle
+ form:
+ permissions: İzinler
index:
card_header: Roller
new_role_link: Yeni Rol Ekle
diff --git a/config/locales/controllers/studentship/course_enrollments.en.yml b/config/locales/controllers/studentship/course_enrollments.en.yml
index 60787ae18..87bb590ce 100644
--- a/config/locales/controllers/studentship/course_enrollments.en.yml
+++ b/config/locales/controllers/studentship/course_enrollments.en.yml
@@ -5,6 +5,10 @@ en:
statuses:
draft: Draft
saved: Saved
+ semester_registration:
+ statuses:
+ draft: Draft
+ saved: Saved
studentship:
course_enrollments:
available_courses: &course_attributes
@@ -25,14 +29,15 @@ en:
success: The course successfully removed from selected courses.
errors:
already_enrolled_at_group: The maximum amount of ECTS that can be selected from the course group is selected.
+ empty_selected_courses_list: The list of selected courses is empty.
quota_full: The course has reached its quota.
must_drop_first: Courses taken from the top semester must be dropped first.
not_enough_ects: The amount of ECTS that can be selected is not enough for you to take this course.
not_proper_register_event_range: There is no online course registration activity covering the date range today.
- registration completed: You can not perform this action since you have completed the course selection.
+ registration_completed: You can not perform this action since you have completed the course selection.
index:
course_enrollments: Course Enrollments
- enrollment_status: Enrollment Status
+ registration_status: Enrollment Status
registration_date_range: "Online Course Registration Dates: %{start_time} - %{end_time}"
list:
<<: *course_attributes
@@ -54,7 +59,7 @@ en:
success: Selected courses successfully saved.
student_info:
academic_term: Academic Term
- enrollment_status: Enrollment Status
+ registration_status: Enrollment Status
gpa: GPA
program: Program
student_info: Student Information
diff --git a/config/locales/controllers/studentship/course_enrollments.tr.yml b/config/locales/controllers/studentship/course_enrollments.tr.yml
index a6aef35af..5916503a9 100644
--- a/config/locales/controllers/studentship/course_enrollments.tr.yml
+++ b/config/locales/controllers/studentship/course_enrollments.tr.yml
@@ -5,6 +5,10 @@ tr:
statuses:
draft: Taslak
saved: Kaydedildi
+ semester_registration:
+ statuses:
+ draft: Taslak
+ saved: Kaydedildi
studentship:
course_enrollments:
available_courses: &course_attributes
@@ -25,14 +29,15 @@ tr:
success: Ders seçilen derslerden çıkarıldı.
errors:
already_enrolled_at_group: Ders grubundan seçilebilecek maksimum AKTS miktarı kadar ders seçilmiş.
+ empty_selected_courses_list: Seçilen dersler listesi boş.
quota_full: Ders için belirlenen kontenjan dolmuş.
must_drop_first: Öncelikli olarak en üst dönemden alınan dersler çıkarılmalı.
not_enough_ects: Seçilebilecek AKTS miktarı bu dersi alabilmeniz için yeterli değil.
not_proper_register_event_range: Tarih aralığı bugünü kapsayan çevrimiçi ders kayıtlanma aktivitesi bulunmamaktadır.
- registration completed: Ders seçimini tamamladığınız için bu işlemi gerçekleştiremezsiniz.
+ registration_completed: Ders seçimini tamamladığınız için bu işlemi gerçekleştiremezsiniz.
index:
course_enrollments: Ders Kayıtları
- enrollment_status: Kayıtlanma Durumu
+ registration_status: Kayıt Durumu
registration_date_range: "Çevrimiçi Ders Kayıt Tarihleri: %{start_time} - %{end_time}"
list:
<<: *course_attributes
@@ -54,7 +59,7 @@ tr:
success: Seçilen dersler başarıyla kaydedildi.
student_info:
academic_term: Akademik Dönem
- enrollment_status: Kayıtlanma Durumu
+ registration_status: Kayıtlanma Durumu
gpa: GANO
program: Program
student_info: Öğrenci Bilgileri
diff --git a/config/locales/errors/en.yml b/config/locales/errors/en.yml
index 099bf84f6..1f113f7d5 100644
--- a/config/locales/errors/en.yml
+++ b/config/locales/errors/en.yml
@@ -6,3 +6,4 @@ en:
invalid_email: This is not a valid e-mail address!
system_error: The system error has occurred. Please try later.
unicode_not_supported: Receiver does not support unicode encoding!
+ invalid_authenticity_token: Invalid authenticity token! Please try again.
diff --git a/config/locales/errors/tr.yml b/config/locales/errors/tr.yml
index 2b9967d6b..575209ba7 100644
--- a/config/locales/errors/tr.yml
+++ b/config/locales/errors/tr.yml
@@ -6,3 +6,4 @@ tr:
invalid_email: Geçerli bir e-mail adresi değil!
system_error: Sistemsel bir hata oluştu. Lütfen daha sonra tekrar deneyin.
unicode_not_supported: Alıcı numara unicode desteklemiyor!
+ invalid_authenticity_token: Geçersiz kimlik doğrulama jetonu! Lütfen tekrar deneyin.
diff --git a/config/locales/patron/en.yml b/config/locales/patron/en.yml
index 83aa30908..816aa2de5 100644
--- a/config/locales/patron/en.yml
+++ b/config/locales/patron/en.yml
@@ -1,5 +1,7 @@
en:
patron:
+ errors:
+ invalid_privilege: '