[dgoette] 39514: * fix bug in converter (interchanged columns) * remove unneeded filter setting (check if you can view entries, is done for every entry)

Author: dgoette
Date: Mon Feb  9 09:05:14 2009
New Revision: 39514

URL: http://svn.reactos.org/svn/reactos?rev=39514&view=rev
Log:
* fix bug in converter (interchanged columns)
* remove unneeded filter setting (check if you can view entries, is done for every entry)

Modified:
    branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql
    branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js

Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros...
==============================================================================
--- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Mon Feb  9 09:05:14 2009
@@ -187,8 +187,8 @@
 INSERT INTO roscms_rel_acl
 SELECT DISTINCT
   NULL,
+  r.id,
   a.id,
-  r.id,
   g.id
 FROM roscms_entries_access a JOIN data_security s ON a.name_short=s.sec_name JOIN roscms_groups g JOIN roscms_entries_areas r WHERE (((
    (g.security_level = 1 AND s.sec_lev1_read = 1 AND r.name_short='read')

Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ros...
==============================================================================
--- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Mon Feb  9 09:05:14 2009
@@ -2174,32 +2174,32 @@
       break;

case '2':
-      filtstring2 = 'k_is_new_0|c_is_type_0|l_is_'+userlang+'_1|i_is_read_0|o_desc_datetime_1';
+      filtstring2 = 'k_is_new_0|c_is_type_0|l_is_'+userlang+'_1|o_desc_datetime_1';
       loadEntryTable('new');
       break;

case '3':
-      filtstring2 = 'y_is_page_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1';
+      filtstring2 = 'y_is_page_0|k_is_stable_0|c_is_language_1|o_asc_name_1';
       loadEntryTable('page');
       break;

case '13':
-      filtstring2 = 'y_is_dynamic_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1';
+      filtstring2 = 'y_is_dynamic_0|k_is_stable_0|c_is_language_1|o_asc_name_1';
       loadEntryTable('dynamic');
       break;

case '4':
-      filtstring2 = 'y_is_content_0|k_is_stable_0|l_is_'+userlang+'_1|i_is_read_0|o_asc_name_1';
+      filtstring2 = 'y_is_content_0|k_is_stable_0|l_is_'+userlang+'_1|o_asc_name_1';
       loadEntryTable('content');
       break;

case '5':
-      filtstring2 = 'y_is_template_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1';
+      filtstring2 = 'y_is_template_0|k_is_stable_0|c_is_language_1|o_asc_name_1';
       loadEntryTable('template');
       break;

case '6':
-      filtstring2 = 'y_is_script_0|k_is_stable_0|c_is_language_1|i_is_read_0|o_asc_name_1';
+      filtstring2 = 'y_is_script_0|k_is_stable_0|c_is_language_1|o_asc_name_1';
       loadEntryTable('script');
       break;

@@ -2217,27 +2217,27 @@

case '8':
     default:
-      filtstring2 = 'c_is_type_1|l_is_'+userlang+'_1|i_is_read_0|o_desc_datetime_1';
+      filtstring2 = 'c_is_type_1|l_is_'+userlang+'_1|o_desc_datetime_1';
       loadEntryTable('all');
       break;

case '9':
-      filtstring2 = 's_is_true_0|c_is_type_1|l_is_'+userlang+'_1|i_is_read_0|o_desc_datetime_1';
+      filtstring2 = 's_is_true_0|c_is_type_1|l_is_'+userlang+'_1|o_desc_datetime_1';
       loadEntryTable('starred');
       break;

case '10':
-      filtstring2 = 'k_is_draft_0|u_is_'+roscms_intern_login_check_username+'_0|c_is_type_1|i_is_read_0|o_desc_datetime_1';
+      filtstring2 = 'k_is_draft_0|u_is_'+roscms_intern_login_check_username+'_0|c_is_type_1|o_desc_datetime_1';
       loadEntryTable('draft');
       break;

case '11':
-      filtstring2 = 'u_is_'+roscms_intern_login_check_username+'_0|c_is_type_1|i_is_read_0|o_desc_datetime_1';
+      filtstring2 = 'u_is_'+roscms_intern_login_check_username+'_0|c_is_type_1|o_desc_datetime_1';
       loadEntryTable('my');
       break;

case '12':
-      filtstring2 = 'k_is_archive_0|c_is_version_1|c_is_type_1|l_is_'+userlang+'_1|o_asc_name_1|i_is_read_0|o_desc_ver_1';
+      filtstring2 = 'k_is_archive_0|c_is_version_1|c_is_type_1|l_is_'+userlang+'_1|o_asc_name_1|o_desc_ver_1';
       roscms_archive = true; /* activate archive mode*/
       loadEntryTable('archive');
       break;