diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-08 13:47:30 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-08 13:47:30 -0700 |
| commit | 7ad203b97a148c1e3b0585bf2554819bdc87ce98 (patch) | |
| tree | 228e1e6ab9242f97687d6c0bb42f3580707b97f9 /modules/gallery | |
| parent | 6f315ad89c06431b408fcdf24393ad13daed845d (diff) | |
| parent | b6c1ba7ea6416630b2a44b3df8400a2d48460b0a (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into talmdal_dev
Diffstat (limited to 'modules/gallery')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 1 | ||||
| -rw-r--r-- | modules/gallery/helpers/photo.php | 1 | ||||
| -rw-r--r-- | modules/gallery/models/item.php | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index 2190fc94..98419387 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -135,6 +135,7 @@ class movie_Core { $group->input("title")->label(t("Title"))->value($movie->title); $group->textarea("description")->label(t("Description"))->value($movie->description); $group->input("filename")->label(t("Filename"))->value($movie->name) + ->rules("required") ->error_messages( "name_conflict", t("There is already a movie, photo or album with this name")) ->callback("item::validate_no_slashes") diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index 692f7111..99f28753 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -163,6 +163,7 @@ class photo_Core { $group->input("title")->label(t("Title"))->value($photo->title); $group->textarea("description")->label(t("Description"))->value($photo->description); $group->input("filename")->label(t("Filename"))->value($photo->name) + ->rules("required") ->error_messages( "name_conflict", t("There is already a movie, photo or album with this name")) ->callback("item::validate_no_slashes") diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php index 5d356841..6f0e3525 100644 --- a/modules/gallery/models/item.php +++ b/modules/gallery/models/item.php @@ -24,7 +24,8 @@ class Item_Model extends ORM_MPTT { var $rules = array( "name" => "required|length[0,255]", "title" => "required|length[0,255]", - "description" => "length[0,65535]" + "description" => "length[0,65535]", + "slug" => "required|length[0,255]" ); /** |