We are moving to Git Issues for bug tracking in future releases. During transition, content will be in both tools. If you'd like to file a new bug, please create an issue.

View | Details | Raw Unified | Return to bug 5543 | Differences between
and this patch

Collapse All | Expand All

(-)a/classes/article/ArticleDAO.inc.php (-2 / +4 lines)
 Lines 140-145   class ArticleDAO extends DAO { Link Here 
140
	 */
140
	 */
141
	function _articleFromRow(&$article, &$row) {
141
	function _articleFromRow(&$article, &$row) {
142
		$article->setId($row['article_id']);
142
		$article->setId($row['article_id']);
143
		$article->setLocale($row['locale']);
143
		$article->setUserId($row['user_id']);
144
		$article->setUserId($row['user_id']);
144
		$article->setJournalId($row['journal_id']);
145
		$article->setJournalId($row['journal_id']);
145
		$article->setSectionId($row['section_id']);
146
		$article->setSectionId($row['section_id']);
 Lines 179-189   class ArticleDAO extends DAO { Link Here 
179
		$article->stampModified();
180
		$article->stampModified();
180
		$this->update(
181
		$this->update(
181
			sprintf('INSERT INTO articles
182
			sprintf('INSERT INTO articles
182
				(user_id, journal_id, section_id, language, comments_to_ed, citations, date_submitted, date_status_modified, last_modified, status, submission_progress, current_round, submission_file_id, revised_file_id, review_file_id, editor_file_id, pages, fast_tracked, hide_author, comments_status)
183
				(locale, user_id, journal_id, section_id, language, comments_to_ed, citations, date_submitted, date_status_modified, last_modified, status, submission_progress, current_round, submission_file_id, revised_file_id, review_file_id, editor_file_id, pages, fast_tracked, hide_author, comments_status)
183
				VALUES
184
				VALUES
184
				(?, ?, ?, ?, ?, ?, %s, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
185
				(?, ?, ?, ?, ?, ?, ?, %s, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
185
				$this->datetimeToDB($article->getDateSubmitted()), $this->datetimeToDB($article->getDateStatusModified()), $this->datetimeToDB($article->getLastModified())),
186
				$this->datetimeToDB($article->getDateSubmitted()), $this->datetimeToDB($article->getDateStatusModified()), $this->datetimeToDB($article->getLastModified())),
186
			array(
187
			array(
188
				$article->getLocale(),
187
				$article->getUserId(),
189
				$article->getUserId(),
188
				$article->getJournalId(),
190
				$article->getJournalId(),
189
				$article->getSectionId(),
191
				$article->getSectionId(),
(-)a/classes/article/PublishedArticleDAO.inc.php (-2 / +2 lines)
 Lines 489-495   class PublishedArticleDAO extends DAO { Link Here 
489
	function &getPublishedArticleIdsAlphabetizedByJournal($journalId = null, $useCache = true) {
489
	function &getPublishedArticleIdsAlphabetizedByJournal($journalId = null, $useCache = true) {
490
		$params = array(
490
		$params = array(
491
			'cleanTitle', Locale::getLocale(),
491
			'cleanTitle', Locale::getLocale(),
492
			'cleanTitle', Locale::getPrimaryLocale()
492
			'cleanTitle'
493
		);
493
		);
494
		if (isset($journalId)) $params[] = $journalId;
494
		if (isset($journalId)) $params[] = $journalId;
495
495
 Lines 503-509   class PublishedArticleDAO extends DAO { Link Here 
503
				articles a
503
				articles a
504
				LEFT JOIN sections s ON s.section_id = a.section_id
504
				LEFT JOIN sections s ON s.section_id = a.section_id
505
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
505
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
506
				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
506
				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
507
			WHERE	pa.article_id = a.article_id
507
			WHERE	pa.article_id = a.article_id
508
				AND i.issue_id = pa.issue_id
508
				AND i.issue_id = pa.issue_id
509
				AND i.published = 1
509
				AND i.published = 1
(-)a/classes/author/form/submit/AuthorSubmitStep1Form.inc.php (+1 lines)
 Lines 113-118   class AuthorSubmitStep1Form extends AuthorSubmitForm { Link Here 
113
			$user =& Request::getUser();
113
			$user =& Request::getUser();
114
114
115
			$this->article = new Article();
115
			$this->article = new Article();
116
			$this->article->setLocale(Locale::getLocale()); // FIXME in bug #5543
116
			$this->article->setUserId($user->getId());
117
			$this->article->setUserId($user->getId());
117
			$this->article->setJournalId($journal->getId());
118
			$this->article->setJournalId($journal->getId());
118
			$this->article->setSectionId($this->getData('sectionId'));
119
			$this->article->setSectionId($this->getData('sectionId'));
(-)a/classes/submission/author/AuthorSubmissionDAO.inc.php (-2 / +1 lines)
 Lines 178-184   class AuthorSubmissionDAO extends DAO { Link Here 
178
				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev
178
				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev
179
			FROM	articles a
179
			FROM	articles a
180
				LEFT JOIN authors aa ON (aa.submission_id = a.article_id AND aa.primary_contact = 1)
180
				LEFT JOIN authors aa ON (aa.submission_id = a.article_id AND aa.primary_contact = 1)
181
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
181
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
182
				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)
182
				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)
183
				LEFT JOIN sections s ON (s.section_id = a.section_id)
183
				LEFT JOIN sections s ON (s.section_id = a.section_id)
184
				LEFT JOIN section_settings stpl ON (s.section_id = stpl.section_id AND stpl.setting_name = ? AND stpl.locale = ?)
184
				LEFT JOIN section_settings stpl ON (s.section_id = stpl.section_id AND stpl.setting_name = ? AND stpl.locale = ?)
 Lines 191-197   class AuthorSubmissionDAO extends DAO { Link Here 
191
			array(
191
			array(
192
				$locale,
192
				$locale,
193
				'cleanTitle',
193
				'cleanTitle',
194
				$primaryLocale,
195
				'cleanTitle',
194
				'cleanTitle',
196
				$locale,
195
				$locale,
197
				'title',
196
				'title',
(-)a/classes/submission/copyeditor/CopyeditorSubmissionDAO.inc.php (-2 / +1 lines)
 Lines 144-150   class CopyeditorSubmissionDAO extends DAO { Link Here 
144
			'abbrev',
144
			'abbrev',
145
			$locale,
145
			$locale,
146
			'cleanTitle', // Article title
146
			'cleanTitle', // Article title
147
			$primaryLocale,
148
			'cleanTitle', // Article title
147
			'cleanTitle', // Article title
149
			$locale,
148
			$locale,
150
			ASSOC_TYPE_ARTICLE,
149
			ASSOC_TYPE_ARTICLE,
 Lines 263-269   class CopyeditorSubmissionDAO extends DAO { Link Here 
263
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
262
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
264
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
263
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
265
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
264
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
266
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
265
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
267
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
266
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
268
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
267
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
269
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)
268
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)
(-)a/classes/submission/editor/EditorSubmissionDAO.inc.php (-2 / +1 lines)
 Lines 197-203   class EditorSubmissionDAO extends DAO { Link Here 
197
			'abbrev',
197
			'abbrev',
198
			$locale,
198
			$locale,
199
			'cleanTitle', // Article title
199
			'cleanTitle', // Article title
200
			$primaryLocale,
201
			'cleanTitle',
200
			'cleanTitle',
202
			$locale,
201
			$locale,
203
			$journalId
202
			$journalId
 Lines 298-304   class EditorSubmissionDAO extends DAO { Link Here 
298
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
297
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
299
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
298
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
300
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
299
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
301
				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
300
				LEFT JOIN article_settings atpl ON (a.article_id = atpl.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
302
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
301
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
303
				LEFT JOIN edit_assignments ea ON (a.article_id = ea.article_id)
302
				LEFT JOIN edit_assignments ea ON (a.article_id = ea.article_id)
304
				LEFT JOIN edit_assignments ea2 ON (a.article_id = ea2.article_id AND ea.edit_id < ea2.edit_id)
303
				LEFT JOIN edit_assignments ea2 ON (a.article_id = ea2.article_id AND ea.edit_id < ea2.edit_id)
(-)a/classes/submission/layoutEditor/LayoutEditorSubmissionDAO.inc.php (-5 / +4 lines)
 Lines 129-144   class LayoutEditorSubmissionDAO extends DAO { Link Here 
129
		$primaryLocale = Locale::getPrimaryLocale();
129
		$primaryLocale = Locale::getPrimaryLocale();
130
		$locale = Locale::getLocale();
130
		$locale = Locale::getLocale();
131
		$params = array(
131
		$params = array(
132
			'title',
132
			'title', // Section title
133
			$primaryLocale,
133
			$primaryLocale,
134
			'title',
134
			'title',
135
			$locale,
135
			$locale,
136
			'abbrev',
136
			'abbrev', // Section abbrev.
137
			$primaryLocale,
137
			$primaryLocale,
138
			'abbrev',
138
			'abbrev',
139
			$locale,
139
			$locale,
140
			'cleanTitle',
140
			'cleanTitle', // Article title
141
			$primaryLocale,
142
			'cleanTitle',
141
			'cleanTitle',
143
			$locale,
142
			$locale,
144
			ASSOC_TYPE_ARTICLE,
143
			ASSOC_TYPE_ARTICLE,
 Lines 256-262   class LayoutEditorSubmissionDAO extends DAO { Link Here 
256
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
255
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
257
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
256
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
258
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
257
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
259
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
258
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
260
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
259
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
261
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
260
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
262
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)
261
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)
(-)a/classes/submission/proofreader/ProofreaderSubmissionDAO.inc.php (-5 / +4 lines)
 Lines 131-146   class ProofreaderSubmissionDAO extends DAO { Link Here 
131
		$locale = Locale::getLocale();
131
		$locale = Locale::getLocale();
132
132
133
		$params = array(
133
		$params = array(
134
			'title',
134
			'title', // Section title
135
			$primaryLocale,
135
			$primaryLocale,
136
			'title',
136
			'title',
137
			$locale,
137
			$locale,
138
			'abbrev',
138
			'abbrev', // Section abbrev.
139
			$primaryLocale,
139
			$primaryLocale,
140
			'abbrev',
140
			'abbrev',
141
			$locale,
141
			$locale,
142
			'cleanTitle',
142
			'cleanTitle', // Article title
143
			$primaryLocale,
144
			'cleanTitle',
143
			'cleanTitle',
145
			$locale,
144
			$locale,
146
			ASSOC_TYPE_ARTICLE, 
145
			ASSOC_TYPE_ARTICLE, 
 Lines 257-263   class ProofreaderSubmissionDAO extends DAO { Link Here 
257
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
256
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
258
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
257
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
259
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
258
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
260
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
259
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
261
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? and atl.locale = ?)
260
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? and atl.locale = ?)
262
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
261
				LEFT JOIN signoffs scpf ON (a.article_id = scpf.assoc_id AND scpf.assoc_type = ? AND scpf.symbolic = ?)
263
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)
262
				LEFT JOIN signoffs sle ON (a.article_id = sle.assoc_id AND sle.assoc_type = ? AND sle.symbolic = ?)
(-)a/classes/submission/reviewer/ReviewerSubmissionDAO.inc.php (-5 / +4 lines)
 Lines 210-216   class ReviewerSubmissionDAO extends DAO { Link Here 
210
				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev
210
				COALESCE(sal.setting_value, sapl.setting_value) AS section_abbrev
211
			FROM	articles a
211
			FROM	articles a
212
				LEFT JOIN review_assignments r ON (a.article_id = r.submission_id)
212
				LEFT JOIN review_assignments r ON (a.article_id = r.submission_id)
213
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
213
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
214
				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)
214
				LEFT JOIN article_settings atl ON (atl.article_id = a.article_id AND atl.setting_name = ? AND atl.locale = ?)
215
				LEFT JOIN sections s ON (s.section_id = a.section_id)
215
				LEFT JOIN sections s ON (s.section_id = a.section_id)
216
				LEFT JOIN users u ON (r.reviewer_id = u.user_id)
216
				LEFT JOIN users u ON (r.reviewer_id = u.user_id)
 Lines 236-250   class ReviewerSubmissionDAO extends DAO { Link Here 
236
		$result =& $this->retrieveRange(
236
		$result =& $this->retrieveRange(
237
			$sql,
237
			$sql,
238
			array(
238
			array(
239
				'cleanTitle',
239
				'cleanTitle', // Article title
240
				$primaryLocale,
241
				'cleanTitle',
240
				'cleanTitle',
242
				$locale,
241
				$locale,
243
				'title',
242
				'title', // Section title
244
				$primaryLocale,
243
				$primaryLocale,
245
				'title',
244
				'title',
246
				$locale,
245
				$locale,
247
				'abbrev',
246
				'abbrev', // Section abbreviation
248
				$primaryLocale,
247
				$primaryLocale,
249
				'abbrev',
248
				'abbrev',
250
				$locale,
249
				$locale,
(-)a/classes/submission/sectionEditor/SectionEditorSubmissionDAO.inc.php (-3 / +2 lines)
 Lines 346-354   class SectionEditorSubmissionDAO extends DAO { Link Here 
346
			'abbrev',
346
			'abbrev',
347
			$locale,
347
			$locale,
348
			'cleanTitle', // Article title
348
			'cleanTitle', // Article title
349
			'cleanTitle',
349
			$locale,
350
			$locale,
350
			'cleanTitle', // Article title
351
			$primaryLocale,
352
			$journalId,
351
			$journalId,
353
			$sectionEditorId
352
			$sectionEditorId
354
		);
353
		);
 Lines 466-472   class SectionEditorSubmissionDAO extends DAO { Link Here 
466
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
465
				LEFT JOIN section_settings stl ON (s.section_id = stl.section_id AND stl.setting_name = ? AND stl.locale = ?)
467
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
466
				LEFT JOIN section_settings sapl ON (s.section_id = sapl.section_id AND sapl.setting_name = ? AND sapl.locale = ?)
468
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
467
				LEFT JOIN section_settings sal ON (s.section_id = sal.section_id AND sal.setting_name = ? AND sal.locale = ?)
469
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = ?)
468
				LEFT JOIN article_settings atpl ON (atpl.article_id = a.article_id AND atpl.setting_name = ? AND atpl.locale = a.locale)
470
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
469
				LEFT JOIN article_settings atl ON (a.article_id = atl.article_id AND atl.setting_name = ? AND atl.locale = ?)
471
				LEFT JOIN edit_decisions edec ON (a.article_id = edec.article_id)
470
				LEFT JOIN edit_decisions edec ON (a.article_id = edec.article_id)
472
				LEFT JOIN edit_decisions edec2 ON (a.article_id = edec2.article_id AND edec.edit_decision_id < edec2.edit_decision_id)
471
				LEFT JOIN edit_decisions edec2 ON (a.article_id = edec2.article_id AND edec.edit_decision_id < edec2.edit_decision_id)
(-)a/dbscripts/xml/ojs_schema.xml (+1 lines)
 Lines 423-428    Link Here 
423
			<KEY />
423
			<KEY />
424
			<AUTOINCREMENT />
424
			<AUTOINCREMENT />
425
		</field>
425
		</field>
426
		<field name="locale" type="C2" size="5" />
426
		<field name="user_id" type="I8">
427
		<field name="user_id" type="I8">
427
			<NOTNULL />
428
			<NOTNULL />
428
		</field>
429
		</field>
(-)a/dbscripts/xml/upgrade/2.3.2_update.xml (+9 lines)
 Lines 32-35    Link Here 
32
	<sql>
32
	<sql>
33
		<query>UPDATE notes SET assoc_type = 257</query><!-- ASSOC_TYPE_ARTICLE -->
33
		<query>UPDATE notes SET assoc_type = 257</query><!-- ASSOC_TYPE_ARTICLE -->
34
	</sql>
34
	</sql>
35
	<!-- Bug #5543: Implement multilingual specification -->
36
	<sql>
37
		<query driver="mysql">
38
			UPDATE articles a, journals j SET a.locale = j.primary_locale WHERE a.journal_id = j.journal_id
39
		</query>
40
		<query driver="postgres7">
41
			UPDATE articles SET locale = j.primary_locale FROM journals j WHERE articles.journal_id = j.journal_id
42
		</query>
43
	</sql>
35
</data>
44
</data>
(-)a/lib/pkp (-1 / +1 lines)
Line 1    Link Here 
1
Subproject commit 794da05073ebccb3bccd1b2b024fab742c444ae7
1
Subproject commit 0171a4dc5cd17722a3f5c23e35c81726c8a4abfe
(-)a/plugins/importexport/native/NativeImportDom.inc.php (+1 lines)
 Lines 636-641   class NativeImportDom { Link Here 
636
		$articleDao =& DAORegistry::getDAO('ArticleDAO');
636
		$articleDao =& DAORegistry::getDAO('ArticleDAO');
637
637
638
		$article = new Article();
638
		$article = new Article();
639
		$article->setLocale($journalPrimaryLocale); // FIXME in bug #5543
639
		$article->setJournalId($journal->getId());
640
		$article->setJournalId($journal->getId());
640
		$article->setUserId($user->getId());
641
		$article->setUserId($user->getId());
641
		$article->setSectionId($section->getId());
642
		$article->setSectionId($section->getId());
(-)a/plugins/importexport/quickSubmit/QuickSubmitForm.inc.php (+1 lines)
 Lines 154-159   class QuickSubmitForm extends Form { Link Here 
154
		$user =& Request::getUser();
154
		$user =& Request::getUser();
155
155
156
		$article = new Article();
156
		$article = new Article();
157
		$article->setLocale($journal->getPrimaryLocale()); // FIXME in bug #5543
157
		$article->setUserId($user->getId());
158
		$article->setUserId($user->getId());
158
		$article->setJournalId($journal->getId());
159
		$article->setJournalId($journal->getId());
159
		$article->setSectionId($this->getData('sectionId'));
160
		$article->setSectionId($this->getData('sectionId'));
(-)a/plugins/reports/articles/ArticleReportDAO.inc.php (-14 / +10 lines)
 Lines 35-58   class ArticleReportDAO extends DAO { Link Here 
35
				COALESCE(sl.setting_value, spl.setting_value) AS section_title,
35
				COALESCE(sl.setting_value, spl.setting_value) AS section_title,
36
				a.status AS status,
36
				a.status AS status,
37
				a.language AS language
37
				a.language AS language
38
			FROM
38
			FROM	articles a
39
				articles a
39
				LEFT JOIN article_settings aspl1 ON (aspl1.article_id=a.article_id AND aspl1.setting_name = ? AND aspl1.locale = a.locale)
40
					LEFT JOIN article_settings aspl1 ON (aspl1.article_id=a.article_id AND aspl1.setting_name = ? AND aspl1.locale = ?)
40
				LEFT JOIN article_settings asl1 ON (asl1.article_id=a.article_id AND asl1.setting_name = ? AND asl1.locale = ?)
41
					LEFT JOIN article_settings asl1 ON (asl1.article_id=a.article_id AND asl1.setting_name = ? AND asl1.locale = ?)
41
				LEFT JOIN article_settings aspl2 ON (aspl2.article_id=a.article_id AND aspl2.setting_name = ? AND aspl2.locale = a.locale)
42
					LEFT JOIN article_settings aspl2 ON (aspl2.article_id=a.article_id AND aspl2.setting_name = ? AND aspl2.locale = ?)
42
				LEFT JOIN article_settings asl2 ON (asl2.article_id=a.article_id AND asl2.setting_name = ? AND asl2.locale = ?)
43
					LEFT JOIN article_settings asl2 ON (asl2.article_id=a.article_id AND asl2.setting_name = ? AND asl2.locale = ?)
43
				LEFT JOIN section_settings spl ON (spl.section_id=a.section_id AND spl.setting_name = ? AND spl.locale = ?)
44
					LEFT JOIN section_settings spl ON (spl.section_id=a.section_id AND spl.setting_name = ? AND spl.locale = ?)
44
				LEFT JOIN section_settings sl ON (sl.section_id=a.section_id AND sl.setting_name = ? AND sl.locale = ?)
45
					LEFT JOIN section_settings sl ON (sl.section_id=a.section_id AND sl.setting_name = ? AND sl.locale = ?)
45
			WHERE	a.journal_id = ?
46
			WHERE
47
				a.journal_id = ?
48
			ORDER BY a.article_id',
46
			ORDER BY a.article_id',
49
			array(
47
			array(
50
				'title',
48
				'title', // Article title
51
				$primaryLocale,
52
				'title',
49
				'title',
53
				$locale,
50
				$locale,
54
				'abstract',
51
				'abstract', // Article abstract
55
				$primaryLocale,
56
				'abstract',
52
				'abstract',
57
				$locale,
53
				$locale,
58
				'title',
54
				'title',
(-)a/plugins/reports/reviews/ReviewReportDAO.inc.php (-3 / +2 lines)
 Lines 62-75   class ReviewReportDAO extends DAO { Link Here 
62
			FROM	review_assignments r
62
			FROM	review_assignments r
63
				LEFT JOIN articles a ON r.submission_id = a.article_id
63
				LEFT JOIN articles a ON r.submission_id = a.article_id
64
				LEFT JOIN article_settings asl ON (a.article_id=asl.article_id AND asl.locale=? AND asl.setting_name=?)
64
				LEFT JOIN article_settings asl ON (a.article_id=asl.article_id AND asl.locale=? AND asl.setting_name=?)
65
				LEFT JOIN article_settings aspl ON (a.article_id=aspl.article_id AND aspl.locale=? AND aspl.setting_name=?),
65
				LEFT JOIN article_settings aspl ON (a.article_id=aspl.article_id AND aspl.locale=a.locale AND aspl.setting_name=?),
66
				users u
66
				users u
67
			WHERE	u.user_id=r.reviewer_id AND a.journal_id= ?
67
			WHERE	u.user_id=r.reviewer_id AND a.journal_id= ?
68
			ORDER BY article',
68
			ORDER BY article',
69
			array(
69
			array(
70
				$locale,
70
				$locale, // Article title
71
				'title',
71
				'title',
72
				$primaryLocale,
73
				'title',
72
				'title',
74
				$journalId
73
				$journalId
75
			)
74
			)

Return to bug 5543