Commit Graph

188 Commits

Author SHA1 Message Date
Bharat Mediratta
fc5d1e5d74 Fix a bug where we weren't replacing table names when there's no
prefix.  This is wrong because even when there's no prefix we have to
get rid of the {curly} braces.
2009-12-27 12:41:52 -08:00
Bharat Mediratta
63fd9622c0 Don't use as_array() on the result from db::build()->execute() -- it's no longer necessary. 2009-12-22 16:50:15 -08:00
Bharat Mediratta
a6da027aad The default value for $offset should always be null (according to the
new K24 ORM).

Fix up a bad where tuple in the test.
2009-12-22 16:22:24 -08:00
Bharat Mediratta
8b9a02084a Updates for the latest version of Kohana 2.4:
1) Controller::$input is gone -- use Input::instance() now
2) Handle new 'database.<default>.connection.params' parameter
3) Handle new 'cache.<default>.prefix' parameter
2009-12-21 21:27:43 -08:00
Bharat Mediratta
5df1dc135b Fix some bugs in the cache database driver, and update the tests for K24. 2009-12-21 12:13:25 -08:00
Bharat Mediratta
0cd03c8883 Add Database::set_default_instance() for tests 2009-12-21 11:30:26 -08:00
Bharat Mediratta
2aba8c4bff Simplify add_table_prefixes. In Kohana 2.4, it returns the bare table
name, not the prefixed one so this makes our logic easier.
2009-12-17 21:05:47 -08:00
Bharat Mediratta
c22bf27cc2 Add the current file/line at the top of the trace. 2009-12-06 21:02:30 -08:00
Bharat Mediratta
2be72bb1c3 Overload Kohana_Exception::text() to dump out the complete stack trace
so that we have useful data in the logs.
2009-12-06 20:42:38 -08:00
Bharat Mediratta
112aafe513 Oops, removed the overload for query() before, we need this back so
that we can prefix table names properly.
2009-12-06 19:51:00 -08:00
Bharat Mediratta
62693db037 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-05 17:56:31 -08:00
Bharat Mediratta
5c107be903 Reload relevant models after acquiring a lock so that we don't make
database calls based on obsolete data, which can lead to data corruption.

Fixes ticket #926.
2009-12-04 11:13:20 -08:00
Bharat Mediratta
c9e6869c68 Rename the "upload_limit" variable to "simultaneous_upload_limit" for
clarity, since it only limits concurrency not the number of actual uploads.

Move the default-setting code into the upgrader so that we avoid
creating the variable as a side-effect of the view (personal
preference to avoid side-effect code since it's led to problems in the
past).
2009-12-02 19:08:13 -08:00
Tim Almdal
1ab8ac305b Allow users to override the number of simulatenous uploads. This setting won't appear until after they have attempted to upload at least once and have issues. 2009-12-02 12:09:34 -08:00
Bharat Mediratta
87bc32345f Use select() instead of select("*") 2009-12-02 10:42:49 -08:00
Bharat Mediratta
d2cb217e20 Convert more database calls over to the new format
- admin/maintenance page loads, the rebuild thumbs/resizes task works
- Fixed up some conversion bugs in the Cache driver
2009-12-02 00:34:34 -08:00
Bharat Mediratta
3f63e1c521 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
	modules/gallery/helpers/theme.php
	modules/gallery/libraries/Admin_View.php
	modules/gallery/libraries/Theme_View.php
2009-11-29 02:45:39 -08:00
Bharat Mediratta
3d4672ba88 Give the theme a chance to handle theme function callbacks as well. 2009-11-28 23:48:38 -08:00
Bharat Mediratta
22149b52c3 Move the theme fallback checking into theme::load_themes() so that
we're calling it once per request.
2009-11-27 17:12:13 -08:00
Bharat Mediratta
96b00d6cfe Convert some more Database::instance() calls to db::build() form. 2009-11-26 21:14:54 -08:00
Bharat Mediratta
a3d904bcba ORM::find_all() now uses null as the default value for offset. 2009-11-26 19:36:57 -08:00
Bharat Mediratta
54be15191b Overload Database_Builder to add merge_where() which takes predefined
where clauses and adds them to the existing query.  Update all
existing queries that take an additional where clause to use it.
2009-11-26 18:47:40 -08:00
Bharat Mediratta
1fd0e14359 Convert all DB where() calls to take 3 arguments.
Convert all open_paren() calls to and_open() or or_open() as appropriate.
2009-11-26 12:09:04 -08:00
Bharat Mediratta
2ee38b3d8e ORM::$rules now has a special meaning. Use $form_rules for our
internal rules code.
2009-11-26 11:36:09 -08:00
Bharat Mediratta
4b2e1344b4 Move the CSRF initialization into the constructor, I don't see why we
need it also in render().
2009-11-25 20:05:38 -08:00
Bharat Mediratta
ccb0ea3d30 Make globals work if you access the the variables directly with
$v->foo instead of doing it in a rendered template.
2009-11-25 19:24:50 -08:00
Bharat Mediratta
7eacc465d5 Fix set_global() to be more elegant and preserve local trumping 2009-11-25 14:50:29 -08:00
Bharat Mediratta
daedadda75 Switch from stdClass to arrays for global data. 2009-11-25 14:27:06 -08:00
Bharat Mediratta
7c9bd9e8e8 Call execute() after upate() and insert(). 2009-11-25 13:59:01 -08:00
Bharat Mediratta
2e420522ec Preliminary work to cut over to Kohana 2.4
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
2009-11-25 13:22:24 -08:00
Bharat Mediratta
01e10d1708 K2.4 has its own parentheses support 2009-11-24 19:24:38 -08:00
Bharat Mediratta
3ed7a5af46 Rename I18n to Gallery_I18n to avoid conflict with Kohana 2.4 2009-11-24 19:24:02 -08:00
Tim Almdal
ee9c921397 Don't use realpath when calculating the relative paths of embedded references in css files. This fixes ticket #910 2009-11-21 09:36:12 -08:00
Bharat Mediratta
9d40f6fc00 Paginator: don't try to set the position for "other" page types. 2009-11-20 20:29:49 -08:00
Bharat Mediratta
5e9bbbe490 Convert the Simple Uploader form over to Forge, and use the event
model to let the Tags module modify it.  This brings it inline with
our other module-extensible form based interactions.
2009-11-20 19:41:45 -08:00
Tim Almdal
57adefc5ba Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme."
This reverts commit 26114972c3.
2009-11-19 11:44:01 -08:00
Tim Almdal
26114972c3 Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme. 2009-11-18 15:36:13 -08:00
Bharat Mediratta
670312ff10 For album pagination, don't let the last_visible_position exceed the
total.  Fixes ticket #903.
2009-11-18 11:26:19 -08:00
Bharat Mediratta
1067e68292 Redesign the way that we consider page types to create buckets of page
types, and a subtype for specifics.  Currently the top level bucket

   collection, item, other

Here are the core subtypes so far:

   collection: album, search, tag
   item: movie, photo
   other: login, reset, comment-fragment, comment

It's legal to create new page_subtypes whenever you want.  Use the
appropriate page_type to get the coarse grain behavior that you want.
2009-11-17 14:04:45 -08:00
Tim Almdal
2e4d29e7dd If an empty array is passed into set method, then make sure the tag value being stored in the database is null, not "Array" 2009-11-16 14:23:29 -08:00
Bharat Mediratta
5df00737c9 Fix a couple of errors in the refctored paginator code:
1) We weren't showing previous page links for albums when we should have
2) We needed to wrap the results of url::merge() in url::site() so that we
   generate server-relative urls.
2009-11-15 15:24:49 -08:00
Bharat Mediratta
aa1ddba155 Oops. Fix a typo that the forced page_type to always be "tag" 2009-11-14 16:36:25 -08:00
Bharat Mediratta
cd8663b81d Fix pagination so that it does not require any domain specific logic
to support tags and search.  Instead, just modify the page param to
the current page.
2009-11-14 16:31:56 -08:00
Bharat Mediratta
29efb6ba9f Rename "pager" to "paginator" so that we differentiate page.html.php
from paginator.html.php
2009-11-14 16:20:36 -08:00
Bharat Mediratta
081ce9f6ca Normalize pagination so that pager.html.php can handle pagination for
both albums and movies.  Kohana's paginator is not quite sufficient
for this, so create our own pagination logic in Theme_View with only
the stuff we need.

Clearly document the variables available in pager.html so that themers
know how to use it.

Fixes ticket #626.
2009-11-14 14:25:39 -08:00
Tim Almdal
0fe32a61f6 Standardize the name of the blocks. 2009-11-13 13:56:05 -08:00
Tim Almdal
beb63a8380 Clean up the In place edit api:
1) Only allow 1 in place edit to be active at a time (gets around the issue of using an id to identify the form
2) remove the add_ prefix from some of the api methods
3) clean up inconsistent naming
2009-11-06 23:05:20 -08:00
Tim Almdal
b5f2dbc2c4 Create a user_menu for the top of the page. Change the login, edit profile and logout portions of the banner to be rendered by the Theme_View::user_menu callback. This fires the user_menu event. Fixes Ticket #871. 2009-11-06 14:08:46 -08:00
Tim Almdal
b01056da91 Modify the Menu_Element class to allow for the specification of a custom view. Also allow the root element to specify a css id. 2009-11-06 13:03:48 -08:00
Tim Almdal
8ac7a5c0d3 Remove debugging statement 2009-11-05 13:21:40 -08:00