Commit graph

10606 commits

Author SHA1 Message Date
Patrick Donelan
b0c5c09461 Merge branch 'master' into survey
* master: (127 commits)
  Prefill in the email address in the ITransact credentials form from the user's Shop address.
  fixed Matrix best/worst rated lists
  Fix bad form variable for phone number in EMS Badge address info.
  - Added a switch to allow the use of non-WebGUI objects with the Workflow
  fixing a problem with previous survey fix
  fixed #9671: Survey - breaks admin bar
  fixed a Matrix sql problem
  i18n the image labels and title for the asset manager, manage screen.
  Prevent an imported package from changing the a current asset's status from pending to anything else.
  Remove trailing comma in Shop/Transaction JS so IE6 works.
  fixed documentation
  fixed a bug when a matrix listing didn't have a forum attached
  small char encoding fix to merged upgrade
  fix small issue in addChild
  adding merge point
  Fix a problem with purging an EMS.
  Update this template so that it passes the template i18n test.
  Fix a broken i18n label in answer edit template for the Survey.
  Unify all Survey CSS into 1 file, and use it.
  Adding/fixing Survey i18n and Help
  ...

Conflicts:
	lib/WebGUI/Asset/Wobject/Survey.pm
	lib/WebGUI/Asset/Wobject/Survey/ResponseJSON.pm
	lib/WebGUI/i18n/English/Asset_Survey.pm
	www/extras/wobject/Survey/editsurvey/object.js
2009-02-10 07:57:42 +00:00
David Delikat
571c824ad1 fixed bug #9629: override stringify date format to use java default format. 2009-02-10 04:03:27 +00:00
Yung Han Khoe
66e4b23e7f improving matrix performance 2009-02-10 02:17:42 +00:00
Colin Kuskie
6a1bbead00 Prefill in the email address in the ITransact credentials form from the user's Shop address. 2009-02-09 18:45:21 +00:00
Yung Han Khoe
a61dd87d22 fixed Matrix best/worst rated lists 2009-02-09 17:22:32 +00:00
Colin Kuskie
d17e1f21d6 Fix bad form variable for phone number in EMS Badge address info. 2009-02-09 17:16:01 +00:00
JT Smith
be42bb0856 - Added a switch to allow the use of non-WebGUI objects with the Workflow
engine.
2009-02-08 21:20:32 +00:00
Yung Han Khoe
d32137b5db fixing a problem with previous survey fix 2009-02-07 21:08:02 +00:00
Yung Han Khoe
c817937623 fixed #9671: Survey - breaks admin bar 2009-02-07 17:37:37 +00:00
Yung Han Khoe
36d401aa74 fixed a Matrix sql problem 2009-02-06 21:23:39 +00:00
Colin Kuskie
6be6c0bb11 i18n the image labels and title for the asset manager, manage screen.
Also, display the username instead of the userId.
2009-02-06 19:32:05 +00:00
Colin Kuskie
911e30c43c Prevent an imported package from changing the a current asset's status from pending to anything else. 2009-02-06 18:58:10 +00:00
Colin Kuskie
ff3bb6f5b9 Remove trailing comma in Shop/Transaction JS so IE6 works. 2009-02-06 18:47:40 +00:00
Patrick Donelan
675333c54d More documentation tweaks for ResponseJSON 2009-02-06 06:06:29 +00:00
Patrick Donelan
6fddcdaf5f Refactored returnResponseForReporting 2009-02-06 05:51:08 +00:00
Patrick Donelan
fa6976fb40 More ResponseJSON refactoring.
Finished refactoring nextQuestions()
Added recordedResponses sub
Added getTemplatedText sub
Added sectionId, questionId, answerId, sIndex, qIndex, aIndexes
abstraction subs
2009-02-06 05:15:26 +00:00
JT Smith
36eead4e9c fixed documentation 2009-02-06 04:50:46 +00:00
JT Smith
6701a10491 fixed a bug when a matrix listing didn't have a forum attached 2009-02-06 04:49:57 +00:00
Graham Knop
332ace9648 small char encoding fix to merged upgrade 2009-02-06 03:31:39 +00:00
Patrick Donelan
306502465c Started refactoring nextQuestions in ResponseJSON
Made perlcritic happier
Extracted getQuestionResponses from processGotoExpression
Eliminated getPreviousAnswer
2009-02-06 01:56:54 +00:00
Patrick Donelan
3340a675b7 Updated Survey.pm to use new ResponseJSON.pm methods 2009-02-06 01:56:35 +00:00
Patrick Donelan
345989370f Renamed ResponseJSON branching methods 2009-02-06 01:56:18 +00:00
Patrick Donelan
932a033b58 More ResponseJSON refactoring
Removed unnecessary $session argument from recordResponses
Refactored nextQuestions to return a list rather than an arrayref
Lots more documentation for ResponseJSON
More param validation for ResponseJSON
Refactored recordResponses
Updated tests
2009-02-06 01:55:56 +00:00
Patrick Donelan
90d314d2f1 Refactored next/last response/section related accessors and mutators
(and tests).

Added more documentation.
2009-02-06 01:55:33 +00:00
Graham Knop
ede922e060 fix small issue in addChild 2009-02-06 01:04:27 +00:00
Graham Knop
653fea0aa6 adding merge point 2009-02-06 01:04:16 +00:00
Colin Kuskie
6c61eb54db Fix a problem with purging an EMS. 2009-02-05 23:10:35 +00:00
Colin Kuskie
1cbedd34a8 Update this template so that it passes the template i18n test. 2009-02-05 22:46:56 +00:00
Colin Kuskie
b994216944 Fix a broken i18n label in answer edit template for the Survey. 2009-02-05 22:44:48 +00:00
Colin Kuskie
0d09360cdd Unify all Survey CSS into 1 file, and use it. 2009-02-05 22:36:44 +00:00
Yung Han Khoe
71e7db62c6 Adding/fixing Survey i18n and Help 2009-02-05 22:29:36 +00:00
Colin Kuskie
8bc1417091 Fix bad template code in 4 gallery templates. They were functional, just not
using template variables.
2009-02-05 22:13:14 +00:00
Tabitha Zipperer
c6c78794e5 Updated Data Table templates to be compliant with Rogier's templating project 2009-02-05 20:03:25 +00:00
Graham Knop
fbd118d37e fixed: Permissions aren't correctly applied to Article attachments 2009-02-05 20:02:52 +00:00
Kaleb Murphy
4d4dc3b253 Added survey.css as a snippet. Had been left out. 2009-02-05 16:50:15 +00:00
Kaleb Murphy
f38c821be5 Added survey.css as a snippet. Had been left out. 2009-02-05 16:49:58 +00:00
Colin Kuskie
ddff93418c Fix the display of creationDate in the gallery search template. 2009-02-05 01:56:39 +00:00
Colin Kuskie
4c5397ca71 Document the hoverhelp fix in the changelog. 2009-02-04 23:25:06 +00:00
Colin Kuskie
c4d4182f0f Prototype fix for yellow hoverhelp lines in opera/firefox. 2009-02-04 23:20:53 +00:00
Colin Kuskie
f2f8f22669 When data is successfully saved from the edit user preferences form, make it
redraw the Dashboard, instead of the shortcut.
2009-02-04 22:07:50 +00:00
Colin Kuskie
2c6717d508 Fix a dashboard bug where scripts and css needed by user profile fields were not
sent via an AJAX method in the shortcut.
2009-02-04 21:58:34 +00:00
Colin Kuskie
62a14a2dcc Dates in the galley advanced search were ignored. 2009-02-04 16:58:25 +00:00
Colin Kuskie
a5ad3bf4bd Fix broken subfolder synopsis template variable in the Folder. 2009-02-04 16:30:38 +00:00
Colin Kuskie
b8b2a38ef5 Fix the exitURL redirection when a survey is completed and the site uses a gateway url. 2009-02-04 02:22:21 +00:00
Patrick Donelan
669e986189 Replaced ResponseJSON's implementation of shuffle with List::Util's
shuffle and updated Colin's ninja shuffle tests
2009-02-04 02:05:44 +00:00
Patrick Donelan
477f014177 Improved createSurveyOrder documentation, and made perlcritic happy 2009-02-04 00:16:44 +00:00
Patrick Donelan
6fb325699f Refactored createSurveyOrder in ResponseJSON
Added lastSectionIndex, lastQuestionIndex, lastAswerIndex convenience
methods to SurveyJSON to simplify iterations over Sections, Questions
and Answers
2009-02-04 00:16:26 +00:00
Graham Knop
787fe74ee1 fixed #9623: preload.custom paths not included during upgrade 2009-02-03 23:46:41 +00:00
Colin Kuskie
a8f3d2ea30 Fix dotted assetIds in the database for the WebGUI 7 Style snippets, navigations,
folder and Image assets.
2009-02-03 23:42:59 +00:00
Graham Knop
3433c7c332 fixed #9542: Default WebGUI config contains invalid workflow activity 2009-02-03 23:28:25 +00:00