diff --git a/app/Album.php b/app/Album.php
index d4c375a..e51259b 100644
--- a/app/Album.php
+++ b/app/Album.php
@@ -174,6 +174,8 @@ class Album extends Model
return $this->hasMany(Photo::class);
}
+
+
public function redirects()
{
return $this->hasMany(AlbumRedirect::class);
@@ -231,6 +233,11 @@ class Album extends Model
return route('viewAlbum', $this->url_path);
}
+ public function user()
+ {
+ return $this->belongsTo(User::class);
+ }
+
public function userPermissions()
{
return $this->belongsToMany(Permission::class, 'album_user_permissions');
diff --git a/app/Policies/UserPolicy.php b/app/Policies/UserPolicy.php
index 5c79201..ea65850 100644
--- a/app/Policies/UserPolicy.php
+++ b/app/Policies/UserPolicy.php
@@ -31,7 +31,6 @@ class UserPolicy
public function view(User $user, User $userBeingAccessed)
{
- // TODO per-user setting that determines if the page is available
- return true;
+ return $userBeingAccessed->enable_profile_page;
}
}
\ No newline at end of file
diff --git a/app/User.php b/app/User.php
index ad6af6b..6cf4a92 100644
--- a/app/User.php
+++ b/app/User.php
@@ -16,7 +16,7 @@ class User extends Authenticatable
* @var array
*/
protected $fillable = [
- 'name', 'email', 'password', 'is_admin', 'is_activated', 'activation_token'
+ 'name', 'email', 'password', 'is_admin', 'is_activated', 'activation_token', 'profile_alias'
];
/**
@@ -64,4 +64,16 @@ class User extends Authenticatable
{
return $this->id == -1 && $this->name == 'Anonymous';
}
+
+ public function profileUrl()
+ {
+ return route('viewUser', [
+ 'idOrAlias' => (!empty($this->profile_alias) ? trim(strtolower($this->profile_alias)) : $this->id)
+ ]);
+ }
+
+ public function publicDisplayName()
+ {
+ return trim(!empty($this->profile_alias) ? $this->profile_alias : $this->name);
+ }
}
diff --git a/resources/views/themes/base/gallery/album_default.blade.php b/resources/views/themes/base/gallery/album_default.blade.php
index 4096111..47f0b31 100644
--- a/resources/views/themes/base/gallery/album_default.blade.php
+++ b/resources/views/themes/base/gallery/album_default.blade.php
@@ -57,23 +57,7 @@
@foreach ($child_albums as $childAlbum)
-
-
-
 }})
-
-
-
-
+ @include(Theme::viewName('partials.gallery_child_album'));
@endforeach
@foreach ($child_albums as $childAlbum)
-
-
-
-
-
-
-
+ @include(Theme::viewName('partials.gallery_child_album'));
@endforeach
@foreach ($child_albums as $childAlbum)
-
-
-
-
-
-
-
+ @include(Theme::viewName('partials.gallery_child_album'));
@endforeach
 }})
');
});
+
+ $('[data-toggle="tooltip"]').tooltip();
});
@stack('scripts')
diff --git a/resources/views/themes/base/partials/gallery_child_album.blade.php b/resources/views/themes/base/partials/gallery_child_album.blade.php
new file mode 100644
index 0000000..5e1354f
--- /dev/null
+++ b/resources/views/themes/base/partials/gallery_child_album.blade.php
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+