Commit Graph

1497 Commits

Author SHA1 Message Date
Tim Almdal
863deab3d3 Fix a bug where the task message was not being set 2009-07-10 12:54:25 -07:00
Tim Almdal
09c9b1a755 Added the upload::required validation in order to insure that failed uploads
are not treated as successful.
Log any exceptions to the Kohana log and return the error message
2009-07-10 11:35:28 -07:00
Bharat Mediratta
016e04d228 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-10 10:40:20 -07:00
Bharat Mediratta
86a7b15d20 Compact all menus. This fixes the problem that the new [Options]
thumb menu shows up when it has nothing in it.
2009-07-10 10:39:59 -07:00
Tim Almdal
7c993387da Move the dynamic module to gallery3-contrib
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 23:23:51 +08:00
Bharat Mediratta
12796ec2ca Create a new [options] submenu under the thumb menu, and move the
Digibug print button into it.  Right now, it doesn't display properly.
2009-07-10 08:20:00 -07:00
Bharat Mediratta
b3785e1761 Remove debug code. 2009-07-10 08:04:37 -07:00
Bharat Mediratta
5cf267cc4c Fix a bug where we were not properly locating the parent album when
adding a new album or photo.

Simplify the data structure that we pass down to
server_add_tree.html.php so that we just pass a file list and let it
do whatever it wants with it.
2009-07-10 08:01:32 -07:00
Bharat Mediratta
de39dcbce6 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-10 07:37:20 -07:00
Tim Almdal
a059eff25d Make the tag event handle the iptc keywords consistently with
other tag add mechanisms

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 13:13:24 +08:00
Tim Almdal
f4f6dacf7d Correct the pattern match to compress multiple spaces into a single
dot.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 12:48:30 +08:00
Tim Almdal
e3e56827d5 Corrected a problem where the number limit value was being set the
same for both popular and recent changes.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 12:39:24 +08:00
Tim Almdal
4b28f7f50e A few minor changes to add to the dynamic albums module
1) cleanun the two displays of the recent changes page
2) change the name to recent changes.
3) Change the description in module.info
Not quite ready for prime time, some issues with the limit to be
resolved

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 12:39:23 +08:00
Tim Almdal
7862e8b02d Created the dynamic albums module which provides a dynamic album
containing either recent updates or most viewed images.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 12:39:22 +08:00
Tim Almdal
1475b772bd Change the tag importer to convert spaces to a dot in multi word tags.
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 08:22:29 +08:00
Bharat Mediratta
ab5695ca57 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-09 16:34:21 -07:00
Bharat Mediratta
b1f93f358a Fix typo in p::purify() call. 2009-07-09 16:18:39 -07:00
Bharat Mediratta
6fbb1e2daf Avoid blowing the task data column by only adding directories to the queue instead of directories and files. 2009-07-09 14:03:07 -07:00
Bharat Mediratta
fad6c4783e Add status output to make it clearer what's happening when you add files. 2009-07-09 10:46:27 -07:00
Tim Almdal
31ffb82382 Remove the reference to organize.css is it is no longer used and is
producing errors in the log.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-10 01:38:24 +08:00
Bharat Mediratta
b0429797fc Use p::purify instead of p::clean 2009-07-09 10:00:16 -07:00
Tim Almdal
e7e2d99255 Revert "Revert "Add task logging to the "Update Search Index" task""
This reverts commit 5118afc959.
2009-07-09 08:43:42 -07:00
Tim Almdal
724d2af960 Revert "Eliminate temporary variables by passing the $item into the view and"
This reverts commit 1a587fd016.
2009-07-09 08:42:54 -07:00
Tim Almdal
703d93a1ea Revert "ORM::Factory -> ORM::factory"
This reverts commit b1f9eb1d12.
2009-07-09 08:42:32 -07:00
Tim Almdal
5118afc959 Revert "Add task logging to the "Update Search Index" task"
This reverts commit 6ac5238b83.
2009-07-09 08:39:00 -07:00
Bharat Mediratta
1a587fd016 Eliminate temporary variables by passing the $item into the view and
making API calls on the item.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-09 23:34:14 +08:00
Bharat Mediratta
b1f9eb1d12 ORM::Factory -> ORM::factory
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-09 23:33:42 +08:00
Tim Almdal
6ac5238b83 Add task logging to the "Update Search Index" task 2009-07-08 09:27:37 -07:00
Tim Almdal
ac797e609c Add task logging to the Update translations 2009-07-08 09:08:15 -07:00
Tim Almdal
43c6336257 Add Task logging to the Extract EXIF data task 2009-07-08 08:37:40 -07:00
Tim Almdal
9f00e734ed Added the button formatting to the other links on the Admin Maintenance page. 2009-07-08 08:26:14 -07:00
Tim Almdal
47fbb56fa2 Added task logging to the Rebuild Images task. 2009-07-08 08:22:40 -07:00
Tim Almdal
2852161ca3 Provide some clarity on the action links by formating them as buttons on
the Maintenance Tasks admin page.
2009-07-07 21:49:54 -07:00
Bharat Mediratta
74d4a4c0fd Merge branch 'master' of git@github.com:/gallery/gallery3 2009-07-07 21:20:37 -07:00
Bharat Mediratta
faabae5dae Rework server_add. It's smaller and leaner now, storing the list of
files out in a separate model for scalability.  Removed the "pause"
functionality.

- Server_Add_Controller extends Admin_Controller so that we don't have
  to check for admin every time.
- Task completion time now factors in the time it takes to walk the
  arbitrarily deep trees
- Moved checkbox management entirely into JS using jQuery
- Simplified the JS considerably
2009-07-07 21:20:24 -07:00
Andy Staudacher
67e61d30e5 More fixes for ticket 470 (capitalization of reCAPTCHA) 2009-07-07 13:08:35 -07:00
Tim Almdal
5d9e334fe6 Added a wee bit of phpDoc.
Changed the name of the method get_task_log to get_log
Changed the default name of the file when the log is downloaded to
gallery3_task_log.txt
2009-07-07 12:49:21 -07:00
Tim Almdal
e5cd7052e8 Revert "Forgot this when i was cleaning up for ticket #519"
This reverts commit 31969a1d82.
2009-07-07 12:25:19 -07:00
Tim Almdal
72ebc2fb34 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/g2_import/helpers/g2_import.php
2009-07-07 12:17:38 -07:00
Tim Almdal
b0cd0a52be Allow the task::log method to take an array of lines and change g2_import.php
helper to use this approach.
2009-07-07 12:10:50 -07:00
Tim Almdal
31969a1d82 Forgot this when i was cleaning up for ticket #519 2009-07-07 12:09:55 -07:00
Bharat Mediratta
4e0848a1a5 Clean up some indentation. 2009-07-07 11:22:13 -07:00
Tim Almdal
b59e94e7dc Change references to Gallery 2 and Gallery 3 to consistently refer to
Gallery n as opposed any variants of this.
2009-07-07 07:32:36 -07:00
Tim Almdal
493fb27825 Cleanup remove task processing. Change Task_Model::delete to call parent::delete
instead of parent::save. :-) Also change admin_maintenance_controller to delete
via looping over all of the completed tasks and delete individually, so we can
delete the associated cache entries at the same time.
2009-07-06 22:20:04 -07:00
Tim Almdal
6588f3bbd1 Change wording of failed to import tags to make it consistent with the other failed import messages. Thanks shai 2009-07-06 21:46:50 -07:00
Tim Almdal
dfc704516a correct spacing in a message. thanks shai 2009-07-06 21:10:59 -07:00
Tim Almdal
dff0ffc4f5 Fix for tickets #312 and #370. Added a task logging api. Changed g2_import
to write all activity to the "log file".  The "log file" is stored in the
persistent cache.
2009-07-06 20:05:35 -07:00
Bharat Mediratta
30aa065013 Don't use jQuery in the error page, it interferes with the jquery lib
in the outer page when we load it in a dialog context.
2009-07-06 12:41:54 -07:00
Tim Almdal
6dbd36d1cc Always log the task completion status message 2009-07-06 10:29:55 -07:00
Tim Almdal
f381927ec6 Catch exceptions that are thrown within the task and log them to the task log
and then set the task to done, the state to error and the status message set
to the Exception Message.
2009-07-06 07:39:36 -07:00