Skip to content
This repository has been archived by the owner on Sep 25, 2023. It is now read-only.

Commit

Permalink
*5509* Fixed announcement notification URL
Browse files Browse the repository at this point in the history
  • Loading branch information
asmecher committed Jun 21, 2010
1 parent 056882e commit 248057d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions classes/manager/form/AnnouncementForm.inc.php
Expand Up @@ -100,7 +100,7 @@ function _setAnnouncementAssocId(&$announcement) {
* Save announcement.
*/
function execute() {
parent::execute();
$announcement = parent::execute();
$conference =& Request::getConference();
$conferenceId = $conference->getId();

Expand All @@ -119,12 +119,12 @@ function execute() {
$schedConfId = $this->getData('schedConfId');
if ($schedConfId == 0) {
// Associated with the conference as a whole.
$url = Request::url(null, 'index', 'announcement', 'view', array(1));
$url = Request::url(null, 'index', 'announcement', 'view', array($announcement->getId()));
} else {
// Associated with a sched conf -- determine its path.
$schedConfDao =& DAORegistry::getDAO('SchedConfDAO');
$schedConf =& $schedConfDao->getSchedConf($schedConfId);
$url = Request::url(null, $schedConf->getPath(), 'announcement', 'view', array(1));
$url = Request::url(null, $schedConf->getPath(), 'announcement', 'view', array($announcement->getId()));
}

foreach ($notificationUsers as $userRole) {
Expand Down
2 changes: 1 addition & 1 deletion lib/pkp
Submodule pkp updated 83 files
+1 −1 classes/citation/CitationDAO.inc.php
+18 −18 classes/citation/CitationListTokenizerFilter.inc.php
+20 −35 classes/citation/NlmCitationDemultiplexerFilter.inc.php
+49 −37 classes/citation/NlmCitationSchemaFilter.inc.php
+28 −12 classes/citation/lookup/crossref/CrossrefNlmCitationSchemaFilter.inc.php
+16 −4 classes/citation/lookup/isbndb/IsbndbIsbnNlmCitationSchemaFilter.inc.php
+14 −8 classes/citation/lookup/isbndb/IsbndbNlmCitationSchemaFilter.inc.php
+16 −4 classes/citation/lookup/isbndb/IsbndbNlmCitationSchemaIsbnFilter.inc.php
+15 −12 classes/citation/lookup/pubmed/PubmedNlmCitationSchemaFilter.inc.php
+14 −11 classes/citation/lookup/worldcat/WorldcatNlmCitationSchemaFilter.inc.php
+14 −0 classes/citation/output/abnt/NlmCitationSchemaAbntFilter.inc.php
+13 −0 classes/citation/output/apa/NlmCitationSchemaApaFilter.inc.php
+37 −35 classes/citation/output/apa/nlm-citation.tpl
+6 −4 classes/citation/parser/freecite/FreeciteRawCitationNlmCitationSchemaFilter.inc.php
+23 −18 classes/citation/parser/paracite/ParaciteRawCitationNlmCitationSchemaFilter.inc.php
+6 −4 classes/citation/parser/parscit/ParscitRawCitationNlmCitationSchemaFilter.inc.php
+6 −6 classes/citation/parser/regex/RegexRawCitationNlmCitationSchemaFilter.inc.php
+1 −3 classes/controlledVocab/ControlledVocabEntryDAO.inc.php
+5 −5 classes/core/DataObject.inc.php
+0 −2 classes/core/PKPPageRouter.inc.php
+2 −4 classes/db/DAOResultFactory.inc.php
+1 −13 classes/filter/ClassTypeDescription.inc.php
+357 −55 classes/filter/Filter.inc.php
+24 −17 classes/filter/FilterDAO.inc.php
+55 −0 classes/filter/GenericFilter.inc.php
+7 −29 classes/filter/GenericMultiplexerFilter.inc.php
+8 −51 classes/filter/GenericSequencerFilter.inc.php
+0 −27 classes/filter/PrimitiveTypeDescription.inc.php
+0 −34 classes/filter/TypeDescription.inc.php
+24 −4 classes/filter/TypeDescriptionFactory.inc.php
+2 −0 classes/manager/form/PKPAnnouncementForm.inc.php
+11 −61 classes/metadata/CrosswalkFilter.inc.php
+23 −20 classes/metadata/DateStringNormalizerFilter.inc.php
+0 −65 classes/metadata/EliminatingCrosswalkFilter.inc.php
+81 −15 classes/metadata/MetadataDataObjectAdapter.inc.php
+20 −3 classes/metadata/MetadataDescription.inc.php
+12 −20 classes/metadata/MetadataDescriptionDAO.inc.php
+14 −1 classes/metadata/MetadataDescriptionDummyAdapter.inc.php
+0 −18 classes/metadata/MetadataTypeDescription.inc.php
+13 −7 classes/metadata/nlm/NlmCitationSchemaCitationAdapter.inc.php
+6 −13 classes/metadata/nlm/NlmCitationSchemaCitationOutputFormatFilter.inc.php
+24 −10 classes/metadata/nlm/NlmCitationSchemaOpenUrlCrosswalkFilter.inc.php
+32 −10 classes/metadata/nlm/NlmNameSchemaPersonStringFilter.inc.php
+47 −24 classes/metadata/nlm/NlmPersonStringFilter.inc.php
+2 −4 classes/metadata/nlm/OpenUrlCrosswalkFilter.inc.php
+19 −4 classes/metadata/nlm/OpenUrlNlmCitationSchemaCrosswalkFilter.inc.php
+33 −13 classes/metadata/nlm/PersonStringNlmNameSchemaFilter.inc.php
+0 −8 classes/validation/ValidatorTypeDescription.inc.php
+0 −8 classes/xslt/XMLTypeDescription.inc.php
+35 −29 classes/xslt/XSLTransformationFilter.inc.php
+69 −33 controllers/grid/citation/PKPCitationGridHandler.inc.php
+2 −2 controllers/grid/citation/form/CitationForm.inc.php
+1 −1 js/tag-it.js
+7 −0 locale/en_US/manager.xml
+18 −0 styles/content.css
+19 −15 tests/classes/citation/CitationDAOTest.inc.php
+35 −0 tests/classes/citation/CitationListTokenizerFilterTest.inc.php
+9 −11 tests/classes/citation/NlmCitationSchemaFilterTestCase.inc.php
+4 −5 tests/classes/citation/lookup/crossref/CrossrefNlmCitationSchemaFilterTest.php
+0 −2 tests/classes/citation/lookup/isbndb/IsbndbIsbnNlmCitationSchemaFilterTest.inc.php
+2 −2 tests/classes/citation/lookup/worldcat/WorldcatNlmCitationSchemaFilterTest.php
+16 −16 tests/classes/citation/output/NlmCitationSchemaCitationOutputFormatFilterTest.inc.php
+7 −9 tests/classes/citation/output/apa/NlmCitationSchemaApaFilterTest.inc.php
+2 −4 tests/classes/citation/parser/paracite/ParaciteRawCitationNlmCitationSchemaFilterTest.inc.php
+2 −3 tests/classes/citation/parser/regex/RegexRawCitationNlmCitationSchemaFilterTest.inc.php
+0 −17 tests/classes/filter/ClassTypeDescriptionTest.inc.php
+8 −38 tests/classes/filter/CompatibilityTestFilter.inc.php
+9 −6 tests/classes/filter/FilterDAOTest.inc.php
+77 −15 tests/classes/filter/FilterTest.inc.php
+1 −1 tests/classes/filter/TypeDescriptionFactoryTest.inc.php
+0 −2 tests/classes/metadata/DateStringNormalizerFilterTest.inc.php
+7 −8 tests/classes/metadata/MetadataDescriptionDAOTest.inc.php
+15 −2 tests/classes/metadata/MetadataDescriptionDummyAdapterTest.inc.php
+1 −3 tests/classes/metadata/MetadataDescriptionTest.inc.php
+1 −3 tests/classes/metadata/MetadataPropertyTest.inc.php
+5 −19 tests/classes/metadata/MetadataTypeDescriptionTest.inc.php
+104 −0 tests/classes/metadata/nlm/NlmCitationSchemaCitationAdapterTest.inc.php
+0 −2 tests/classes/metadata/nlm/NlmCitationSchemaOpenUrlCrosswalkFilterTest.inc.php
+2 −6 tests/classes/metadata/nlm/NlmNameSchemaPersonStringFilterTest.inc.php
+5 −9 tests/classes/metadata/nlm/OpenUrlCrosswalkFilterTest.inc.php
+0 −2 tests/classes/metadata/nlm/OpenUrlNlmCitationSchemaCrosswalkFilterTest.inc.php
+0 −2 tests/classes/metadata/nlm/PersonStringNlmNameSchemaFilterTest.inc.php
+4 −0 xml/schema/metadata.xml

0 comments on commit 248057d

Please sign in to comment.