Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-Core
Commits
47ee8d6f
Commit
47ee8d6f
authored
4 years ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Adhere to other rules, therefore replace "see" with "view"
parent
1a6070f8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!207
Resolve "Roles and permissions"
Pipeline
#1427
failed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/core/models.py
+3
-3
3 additions, 3 deletions
aleksis/core/models.py
aleksis/core/templates/core/person_full.html
+6
-6
6 additions, 6 deletions
aleksis/core/templates/core/person_full.html
with
9 additions
and
9 deletions
aleksis/core/models.py
+
3
−
3
View file @
47ee8d6f
...
...
@@ -96,9 +96,9 @@ class Person(ExtensibleModel):
verbose_name
=
_
(
"
Person
"
)
verbose_name_plural
=
_
(
"
Persons
"
)
permissions
=
(
(
"
see
_address
"
,
_
(
"
Can
see
address
"
)),
(
"
see
_contact_details
"
,
_
(
"
Can
see
contact details
"
)),
(
"
see
_photo
"
,
_
(
"
Can
see
photo
"
)),
(
"
view
_address
"
,
_
(
"
Can
view
address
"
)),
(
"
view
_contact_details
"
,
_
(
"
Can
view
contact details
"
)),
(
"
view
_photo
"
,
_
(
"
Can
view
photo
"
)),
)
icon_
=
"
person
"
...
...
This diff is collapsed.
Click to expand it.
aleksis/core/templates/core/person_full.html
+
6
−
6
View file @
47ee8d6f
...
...
@@ -23,8 +23,8 @@
<h5>
{% blocktrans %}Contact details{% endblocktrans %}
</h5>
<div
class=
"row"
>
<div
class=
"col s12 m4"
>
{% has_perm 'core.
see
_photo' user person as can_
see
_photo %}
{% if person.photo and can_
see
_photo %}
{% has_perm 'core.
view
_photo' user person as can_
view
_photo %}
{% if person.photo and can_
view
_photo %}
<img
class=
"person-img"
src=
"{% cropped_thumbnail person 'photo_cropping' max_size='300x400' %}"
alt=
"{{ person.first_name }} {{ person.last_name }}"
/>
{% else %}
...
...
@@ -51,8 +51,8 @@
</td>
<td
colspan=
"3"
>
{{ person.get_sex_display }}
</td>
</tr>
{% has_perm 'core.
see
_address' user person as can_
see
_address %}
{% if can_
see
_address %}
{% has_perm 'core.
view
_address' user person as can_
view
_address %}
{% if can_
view
_address %}
<tr>
<td>
<i
class=
"material-icons small"
>
home
</i>
...
...
@@ -61,8 +61,8 @@
<td
colspan=
"2"
>
{{ person.postal_code }} {{ person.place }}
</td>
</tr>
{% endif %}
{% has_perm 'core.
see
_contact_details' user person as can_
see
_contact_details %}
{% if can_
see
_contact_details %}
{% has_perm 'core.
view
_contact_details' user person as can_
view
_contact_details %}
{% if can_
view
_contact_details %}
<tr>
<td>
<i
class=
"material-icons small"
>
phone
</i>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment