Changeset 975

Timestamp:

12/21/06 20:49:54 (2 years ago)

Author:

bchoate

Message:

Removing storage/restoration of thumbnail default height.

Files:

• branches/wheeljack/lib/MT/Asset/Image.pm (modified) (5 diffs)
• branches/wheeljack/lib/MT/Blog.pm (modified) (3 diffs)

branches/wheeljack/lib/MT/Asset/Image.pm

@@ -21 +21 @@
-    my $meta = $obj->SUPER::metadata(@_);
-    $meta->{MT->translate("Actual Dimensions")} = MT->translate(
- x
+,
-        $obj->image_width, $obj->image_height
-    ) if defined $obj->image_width && defined $obj->image_height;
@@ -211 +211 @@
-
-    $param->{can_save_image_defaults} = $perms->can_save_image_defaults ? 1 : 0;
-
+#
-    $param->{popup} = $blog->image_default_popup ? 1 : 0;
-    $param->{image_defaults} = $blog->image_default_set ? 1 : 0;
-    $param->{wrap_text} = $blog->image_default_wrap_text ? 1 : 0;
-    $param->{make_thumb} = $blog->image_default_thumb ? 1 : 0;
@@ -220 +219 @@
-    $param->{'unit_w'.$_} = $blog->image_default_wunits eq $_ ? 1 : 0
-        for qw(percent pixels);
-    $param->{'unit_h'.$_} = $blog->image_default_hunits eq $_ ? 1 : 0
-        for qw(percent pixels);
-    $param->{thumb_width} = $blog->image_default_width || $asset->image_width || 0;
-    $param->{thumb_height} = $blog->image_default_height || $asset->image_height || 0;
-
-    return $app->build_page('asset_image_options.tmpl', $param);
@@ -247 +243 @@
-
-    my($thumb, $thumb_width, $thumb_height);
+    $thumb_width = $param->{thumb_width};
+    $thumb = $param->{thumb};
+    if ($thumb) {
+        if ($thumb_width && ($thumb_width !~ m/^\d+$/)) {
+            undef $thumb_width;
+        }
+        # width > 1000 not really a thumbnail, so consider invalid
+        if ($thumb_width > 1000) {
+            undef $thumb_width;
+        }
+    }
+    if ($thumb && !$thumb_width) {
+        undef $thumb;
+    }
-    if($param->{image_defaults}) {
-        return $app->error($app->translate(
@@ -252 +262 @@
-        )) unless $app->{perms}->can_save_image_defaults;
-        # Save new defaults if requested.
-        $blog->image_default_set(1);
-        $blog->image_default_wrap_text($param->{wrap_text} ? 1 : 0);
-        $blog->image_default_align($param->{align} || MT::Blog::ALIGN());
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        $blog->image_default_popup($param->{popup} ? 1 : 0);
-        $blog->save;

branches/wheeljack/lib/MT/Blog.pm

@@ -79 +79 @@
-        'image_default_width' => 'integer',
-        'image_default_wunits' => 'string(10)',
-        'image_default_height' => 'integer',
-        'image_default_hunits' => 'string(10)',
-        'image_default_constrain' => 'boolean',
-        'image_default_popup' => 'boolean',
-        'image_default_set' => 'boolean',
-    },
-    indexes => {
@@ -102 +99 @@
-# Image upload defaults.
-use constant ALIGN => 'left';
-use constant WIDTH => 100;
-use constant UNITS => 'pixels';
-
@@ -150 +146 @@
-    $blog->image_default_thumb(0);
-    $blog->image_default_width(0);
-    $blog->image_default_height(0);
-    $blog->image_default_wunits('pixels');
-    $blog->image_default_hunits('pixels');
-    $blog->image_default_constrain(1);
-    $blog->image_default_popup(0);