Changeset 22756

Timestamp:

07/01/09 12:18:09 (9 months ago)

Author:

xfade

Message:

Add karma voting checks and direct promotion.

Files:

• branches/ragnaroek/midcom/org.maemo.packages/config/mgdschema.xml (modified) (1 diff)
• branches/ragnaroek/midcom/org.maemo.packages/config/schemadb_repository_default.inc (modified) (1 diff)
• branches/ragnaroek/midcom/org.maemo.packages/handler/repository/queue.php (modified) (2 diffs)
• branches/ragnaroek/midcom/org.maemo.packages/style/package_instance_view.php (modified) (5 diffs)

branches/ragnaroek/midcom/org.maemo.packages/config/mgdschema.xml

@@ -46 +46 @@
-            <description>The repository where packages get promoted to.</description>
-        </property>
+        <property name="promotiondirect" type="bool">
+            <description>Does this repository have a direct promotion?</description>
+        </property>
+        <property name="qascore" type="integer">
+            <description>Required QA score before promotion will be unlocked.</description>
+        </property>
-    </type>
-

branches/ragnaroek/midcom/org.maemo.packages/config/schemadb_repository_default.inc

@@ -210 +210 @@
-                ),
-            ),
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-),
-

branches/ragnaroek/midcom/org.maemo.packages/handler/repository/queue.php

@@ -159 +159 @@
-
-        //TODO: Check if the package meets the promotion criteria
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // Check if all dependencies are available in the repository
-
@@ -210 +240 @@
-            }
-
-
+
+
-                && $found)
-            {
-                $_MIDCOM->generate_error(MIDCOM_ERRCRIT,
-                    'Package ' . $temp_package[0]->name . ' ' . $return_packageinstance[0]->version . ' is not ' . $temp_depends[1] . ' ' . $temp_depends[2] . '.');
-
+ */
-
-            if (!$found)

branches/ragnaroek/midcom/org.maemo.packages/style/package_instance_view.php

@@ -4 +4 @@
-$package_instance_object = $data['package_instance'];
-$package = $data['view_package'];
+$package_object = $data['package'];
-$repository = $data['view_repository'];
-$repository_object = $data['repository_object'];
@@ -108 +109 @@
-$loc = split("/",$package_instance["location"]);
-
+if (    $repository_object->promotionallowed
+    && isset($repository_object->promotiontarget))
+{
+        $qb = org_maemo_packages_repository_dba::new_query_builder();
+        $qb->add_constraint('guid', '=', str_replace("|","",trim($repository_object->promotiontarget)));
+        $qb->set_limit(1);
+        $target_repository = $qb->execute();
+
+        $qb = org_maemo_packages_packageinstance_dba::new_query_builder();
+        $qb->add_constraint('repository', '=', $target_repository[0]->id);
+        $qb->add_constraint('package', '=', $package_object->id);
+        $qb->add_constraint('version', '=', $package_instance_object->version);
+        $qb->set_limit(1);
+        $target_package_count = $qb->count_unchecked();
+}
+
+$package_score = 0;
+
-?>
-<h1><?php echo $package["title"] . ' ' . $package_instance["version"]; ?></h1>
@@ -126 +145 @@
-    <div class="authors"><div class="at">Maintainters:</div><div class="att"><?php echo $author_string; ?></div></div>
-
-
+
+
+
+
+
+
+
+
+
-
-    <div class="size"><div class="st">Size:</div><div class="stt"><?php echo $package_instance["size"]; ?></div></div>
@@ -133 +160 @@
-    <div class="status"><div class="st">Status:</div><div class="stt"><?php echo $package_instance["status"]; ?></div></div>
-
-   
+
-                        if (   $data['favourites_url'] != ''
-
+
+
-                        {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    <div class="package_karma">
-                        <h3>Package karma</h3>
+                        <div class="package_score"><?php echo $package_score. ' (needed for promotion: '.$repository_object->qascore.')'?></div>
+
+                        <div class="package_score_slider">
+                            <div class="package_score_slider_fav"><img src="&(empty_gif_url);" height="4" width="&(slider_fav);" alt="*" /></div>
+                            <div class="package_score_slider_bury"><img src="&(empty_gif_url);" height="4" width="&(slider_bury);" alt="-" /></div>
+                        </div>
-                        <div id="net_nemein_favourites_for_<?php echo $data["package_instance"]->guid; ?>" class='net_nemein_favourites <?php echo net_nemein_favourites_admin::get_json_data($data["package_instance"]->__mgdschema_class_name__, $data["package_instance"]->guid, '/' . $data['favourites_url']);?>'>
-                            <div class="fav_btn"><span class="favs_count">0</span></div>
@@ -155 +223 @@
-                            && !$depends_missing
-                            && $package_instance_object->status != ORG_MAEMO_PACKAGES_PACKAGE_STATUS_PROMOTED
+                            // package is not in target repository already
+                            && $target_package_count == 0
+                            //Direct promotion or if package meets QA based limit.
+                            && (   $package_score >= $repository_object->qascore
+                                || $repository_object->promotiondirect )
-                            // AND application is in testing
-                            // AND (user is maintainer or repository admin)