Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
4787fa0f
Commit
4787fa0f
authored
Apr 27, 2021
by
Yogi
Committed by
James Lopez
Apr 27, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move license history to gl-table utility class
parent
045a85bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
33 deletions
+37
-33
changelogs/unreleased/gl-card-license-history.yml
changelogs/unreleased/gl-card-license-history.yml
+5
-0
ee/app/views/admin/licenses/_license_history.html.haml
ee/app/views/admin/licenses/_license_history.html.haml
+32
-33
No files found.
changelogs/unreleased/gl-card-license-history.yml
0 → 100644
View file @
4787fa0f
---
title
:
Move license history to gl-table utility class
merge_request
:
58531
author
:
Yogi (@yo)
type
:
changed
ee/app/views/admin/licenses/_license_history.html.haml
View file @
4787fa0f
...
@@ -2,37 +2,36 @@
...
@@ -2,37 +2,36 @@
%h4
=
_
(
'License History'
)
%h4
=
_
(
'License History'
)
.card
#license_history
%table
.gl-table.table
#license_history
%table
.table
%thead
%thead
.card-header
%tr
%tr
-
licensee_keys
.
each
do
|
label
|
%th
=
label
%th
=
_
(
'Plan'
)
%th
=
_
(
'Uploaded on'
)
%th
=
_
(
'Valid from'
)
%th
=
_
(
'Expires on'
)
%th
=
_
(
'Users in License'
)
%tbody
-
@licenses
.
each
do
|
license
|
%tr
{
class:
(
'gl-bg-blue-50 font-weight-bold gl-text-blue-500'
if
license
==
@license
),
data:
{
testid:
(
'license-current'
if
license
==
@license
)
}
}
-
licensee_keys
.
each
do
|
label
|
-
licensee_keys
.
each
do
|
label
|
%th
=
label
%td
=
license
.
licensee
[
label
]
%th
=
_
(
'Plan'
)
%td
%th
=
_
(
'Uploaded on'
)
%span
%th
=
_
(
'Valid from'
)
=
license
.
plan
.
capitalize
%th
=
_
(
'Expires on'
)
%td
%th
=
_
(
'Users in License'
)
%span
%tbody
=
l
(
license
.
created_at
,
format: :with_timezone
)
-
@licenses
.
each
do
|
license
|
%td
%tr
{
class:
(
'gl-bg-blue-50 font-weight-bold gl-text-blue-500'
if
license
==
@license
),
data:
{
testid:
(
'license-current'
if
license
==
@license
)
}
}
%span
-
licensee_keys
.
each
do
|
label
|
=
l
(
license
.
starts_at
)
%td
=
license
.
licensee
[
label
]
%td
%td
%span
%span
=
license
.
expires_at
.
present?
?
l
(
license
.
expires_at
)
:
_
(
'Never'
)
=
license
.
plan
.
capitalize
%td
%td
%span
%span
-
if
license
.
restricted?
(
:active_user_count
)
=
l
(
license
.
created_at
,
format: :with_timezone
)
=
license
.
restrictions
[
:active_user_count
]
%td
-
else
%span
=
_
(
'Unlimited'
)
=
l
(
license
.
starts_at
)
%td
%span
=
license
.
expires_at
.
present?
?
l
(
license
.
expires_at
)
:
_
(
'Never'
)
%td
%span
-
if
license
.
restricted?
(
:active_user_count
)
=
license
.
restrictions
[
:active_user_count
]
-
else
=
_
(
'Unlimited'
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment